fix 1000s of link warnings in Mac Raptor / some XP stubs were hiding actual functions

lib/mac/NSRuntime/NSRuntime.exp

@@ -6,10 +6,10 @@ __copy
 __som_check_ev
 __som_check_new
 __vt__Q23std13bad_exception		# std::bad_exception::__vt
-__vt__Q23std9exception		# std::exception::__vt
-what__Q23std9exceptionCFv		# std::exception::what() const
+#__vt__Q23std9exception			# std::exception::__vt
+#what__Q23std9exceptionCFv		# std::exception::what() const
 #__ct__Q23std9exceptionFv		# std::exception::exception()
-__dt__Q23std9exceptionFv		# std::exception::~exception()
+#__dt__Q23std9exceptionFv		# std::exception::~exception()
 what__Q23std13bad_exceptionCFv		# std::bad_exception::what() const
 __end__catch
 __throw
@@ -31,12 +31,12 @@ unexpected__3stdFv		# std::unexpected()
 set_unexpected__3stdFPFv_v		# std::set_unexpected(void (*)(void))
 terminate__3stdFv		# std::terminate()
 set_terminate__3stdFPFv_v		# std::set_terminate(void (*)(void))
-__vt__Q23std8bad_cast		# std::bad_cast::__vt
+#__vt__Q23std8bad_cast		# std::bad_cast::__vt
 __vt__Q23std10bad_typeid		# std::bad_typeid::__vt
 what__Q23std10bad_typeidCFv		# std::bad_typeid::what() const
-what__Q23std8bad_castCFv		# std::bad_cast::what() const
+#what__Q23std8bad_castCFv		# std::bad_cast::what() const
 __dynamic_cast
-__dt__Q23std8bad_castFv		# std::bad_cast::~bad_cast()
+#__dt__Q23std8bad_castFv		# std::bad_cast::~bad_cast()
 __get_typeid
 __dt__Q23std10bad_typeidFv		# std::bad_typeid::~bad_typeid()
 nothrow__3std		# std::nothrow
@@ -50,14 +50,14 @@ __nw__FUl		# operator new(unsigned long)
 #_set_newnonptrmax__3stdFUl		# std::_set_newnonptrmax(unsigned long)
 #_set_newpoolsize__3stdFUl		# std::_set_newpoolsize(unsigned long)
 __throws_bad_alloc__3std		# std::__throws_bad_alloc
-__vt__Q23std9bad_alloc		# std::bad_alloc::__vt
+#__vt__Q23std9bad_alloc		# std::bad_alloc::__vt
 __new_handler__3std		# std::__new_handler
-what__Q23std9bad_allocCFv		# std::bad_alloc::what() const
+#what__Q23std9bad_allocCFv		# std::bad_alloc::what() const
 __del_hdl
 __new_hdl
 set_new_handler__3stdFPFv_v		# std::set_new_handler(void (*)(void))
 __throw_bad_alloc__3stdFv		# std::__throw_bad_alloc()
-__dt__Q23std9bad_allocFv		# std::bad_alloc::~bad_alloc()
+#__dt__Q23std9bad_allocFv		# std::bad_alloc::~bad_alloc()
 qd
 #__ptmf_null
 #longjmp

modules/libimg/src/xpcompat.cpp

@@ -41,6 +41,7 @@ extern ilISystemServices *il_ss;
 #include <limits.h>
 #endif /* XP_PC */
 
+#ifndef XP_MAC
 PR_BEGIN_EXTERN_C
 int MK_UNABLE_TO_LOCATE_FILE = -1;
 int MK_OUT_OF_MEMORY = -2;
@@ -67,6 +68,7 @@ int XP_MSG_COMMENT = -25;
 int XP_MSG_UNKNOWN = -26;	
 int XP_MSG_COMPRESS_REMOVE = -27;	
 PR_END_EXTERN_C
+#endif /* XP_MAC */
 
 char *XP_GetString(int i)
 {
@@ -370,6 +372,7 @@ static void  swap (
 
 /*	Allocate a new copy of a block of binary data, and returns it
  */
+#ifndef XP_MAC
 char * 
 NET_BACopy (char **destination, const char *source, size_t length)
 {
@@ -392,6 +395,7 @@ NET_BACopy (char **destination, const char *source, size_t length)
       }
     return *destination;
 }
+#endif /* XP_MAC */ 
 
 /*	binary block Allocate and Concatenate
  *
@@ -399,6 +403,7 @@ NET_BACopy (char **destination, const char *source, size_t length)
  *   source_length   is the length of the block being added to the 
  *   destination block
  */
+#ifndef XP_MAC
 char * 
 NET_BACat (char **destination, 
 		   size_t destination_length, 
@@ -428,9 +433,11 @@ NET_BACat (char **destination,
 
   return *destination;
 }
+#endif /* XP_MAC */ 
 
 /*	Very similar to strdup except it free's too
  */
+#ifndef XP_MAC
 char * 
 NET_SACopy (char **destination, const char *source)
 {
@@ -453,9 +460,11 @@ NET_SACopy (char **destination, const char *source)
       }
     return *destination;
 }
+#endif /* XP_MAC */ 
 
 /*  Again like strdup but it concatinates and free's and uses Realloc
 */
+#ifndef XP_MAC
 char *
 NET_SACat (char **destination, const char *source)
 {
@@ -481,6 +490,7 @@ NET_SACat (char **destination, const char *source)
       }
     return *destination;
 }
+#endif /* XP_MAC */ 
 
 #if 0
 #include <windows.h>

network/cnvts/cvunzip.c

@@ -27,9 +27,9 @@
 #include "cvunzip.h"
 
 /* BEGIN NEW_STRING_LIB */
-#ifdef XP_MAC
+/*#ifdef XP_MAC
 #include "allxpstr.h"
-#endif
+#endif*/
 /* END NEW_STRING_LIB */
 #ifdef MOZILLA_CLIENT
 

network/module/nsNetStubs.cpp

@@ -572,12 +572,14 @@ LO_DocumentInfo(MWContext *context, NET_StreamClass *stream)
 /*
  *  determine what kind of image data we are dealing with
  */
+#ifndef XP_MAC
 int
 IL_Type(const char *buf, int32 len)
 {
     MOZ_FUNCTION_STUB;
     return 0; /* IL_NOTFOUND */
 }
+#endif /* XP_MAC */ 
 
 /*
  *---------------------------------------------------------------------------
@@ -598,21 +600,25 @@ IL_DisplayMemCacheInfoAsHTML(FO_Present_Types format_out, URL_Struct *urls,
 }
 
 
+#ifndef XP_MAC
 char *
 IL_HTMLImageInfo(char *url_address)
 {
     MOZ_FUNCTION_STUB;
     return NULL;
 }
+#endif /* XP_MAC */ 
 
 
 /* Set limit on approximate size, in bytes, of all pixmap storage used
    by the imagelib.  */
+#ifndef XP_MAC
 void
 IL_SetCacheSize(uint32 new_size)
 {
     MOZ_FUNCTION_STUB;
 }
+#endif /* XP_MAC */ 
 
 
 
@@ -1727,13 +1733,14 @@ MWContext *FE_MakeNewWindow(MWContext *pOldContext, URL_Struct *pUrl, char *pCon
  * closure: Data to be passed as the only argument to "func"
  * msecs:   The number of milli-seconds in the interval
  */
+#ifndef XP_MAC
 PUBLIC void * 
 FE_SetTimeout(TimeoutCallbackFunction func, void * closure, uint32 msecs)
 {
     MOZ_FUNCTION_STUB;
     return NULL;
 }
-
+#endif /* XP_MAC */
 
 /*
  *---------------------------------------------------------------------------

webshell/src/nsPluginViewer.cpp

@@ -69,10 +69,10 @@ public:
   nsIStreamListener* mNextStream;
 };
 
-class nsPluginInstanceOwner : public nsIPluginInstanceOwner {
+class pluginInstanceOwner : public nsIPluginInstanceOwner {
 public:
-  nsPluginInstanceOwner();
-  ~nsPluginInstanceOwner();
+  pluginInstanceOwner();
+  ~pluginInstanceOwner();
 
   NS_DECL_ISUPPORTS
 
@@ -154,7 +154,7 @@ public:
   nsIContentViewerContainer* mContainer;
   nsIURL* mURL;
   nsString mContentType;
-  nsPluginInstanceOwner *mOwner;
+  pluginInstanceOwner *mOwner;
 };
 
 //----------------------------------------------------------------------
@@ -258,7 +258,7 @@ PluginViewerImpl::Init(nsNativeWidget aNativeParent,
 {
   nsresult rv = MakeWindow(aNativeParent, aDeviceContext, aBounds);
   if (NS_OK == rv) {
-    mOwner = new nsPluginInstanceOwner();
+    mOwner = new pluginInstanceOwner();
     if (nsnull != mOwner) {
       NS_ADDREF(mOwner);
       rv = mOwner->Init(this, mWindow);
@@ -519,7 +519,7 @@ PluginListener::OnDataAvailable(nsIURL* aURL, nsIInputStream* aStream,
 
 //----------------------------------------------------------------------
 
-nsPluginInstanceOwner :: nsPluginInstanceOwner()
+pluginInstanceOwner :: pluginInstanceOwner()
 {
   memset(&mPluginWindow, 0, sizeof(mPluginWindow));
   mInstance = nsnull;
@@ -527,7 +527,7 @@ nsPluginInstanceOwner :: nsPluginInstanceOwner()
   mViewer = nsnull;
 }
 
-nsPluginInstanceOwner :: ~nsPluginInstanceOwner()
+pluginInstanceOwner :: ~pluginInstanceOwner()
 {
   if (nsnull != mInstance)
   {
@@ -540,9 +540,9 @@ nsPluginInstanceOwner :: ~nsPluginInstanceOwner()
   mViewer = nsnull;
 }
 
-NS_IMPL_ISUPPORTS(nsPluginInstanceOwner, kIPluginInstanceOwnerIID)
+NS_IMPL_ISUPPORTS(pluginInstanceOwner, kIPluginInstanceOwnerIID)
 
-NS_IMETHODIMP nsPluginInstanceOwner :: SetInstance(nsIPluginInstance *aInstance)
+NS_IMETHODIMP pluginInstanceOwner :: SetInstance(nsIPluginInstance *aInstance)
 {
   NS_IF_RELEASE(mInstance);
   mInstance = aInstance;
@@ -551,7 +551,7 @@ NS_IMETHODIMP nsPluginInstanceOwner :: SetInstance(nsIPluginInstance *aInstance)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsPluginInstanceOwner :: GetInstance(nsIPluginInstance *&aInstance)
+NS_IMETHODIMP pluginInstanceOwner :: GetInstance(nsIPluginInstance *&aInstance)
 {
   NS_IF_ADDREF(mInstance);
   aInstance = mInstance;
@@ -559,19 +559,19 @@ NS_IMETHODIMP nsPluginInstanceOwner :: GetInstance(nsIPluginInstance *&aInstance
   return NS_OK;
 }
 
-NS_IMETHODIMP nsPluginInstanceOwner :: GetWindow(nsPluginWindow *&aWindow)
+NS_IMETHODIMP pluginInstanceOwner :: GetWindow(nsPluginWindow *&aWindow)
 {
   aWindow = &mPluginWindow;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsPluginInstanceOwner :: GetMode(nsPluginMode *aMode)
+NS_IMETHODIMP pluginInstanceOwner :: GetMode(nsPluginMode *aMode)
 {
   *aMode = nsPluginMode_Full;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsPluginInstanceOwner :: CreateWidget(void)
+NS_IMETHODIMP pluginInstanceOwner :: CreateWidget(void)
 {
   PRBool    windowless;
 
@@ -598,7 +598,7 @@ NS_IMETHODIMP nsPluginInstanceOwner :: CreateWidget(void)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsPluginInstanceOwner :: GetURL(const char *aURL, const char *aTarget, void *aPostData)
+NS_IMETHODIMP pluginInstanceOwner :: GetURL(const char *aURL, const char *aTarget, void *aPostData)
 {
   nsresult  rv;
 
@@ -648,7 +648,7 @@ NS_IMETHODIMP nsPluginInstanceOwner :: GetURL(const char *aURL, const char *aTar
   return rv;
 }
 
-NS_IMETHODIMP nsPluginInstanceOwner :: ShowStatus(const char *aStatusMsg)
+NS_IMETHODIMP pluginInstanceOwner :: ShowStatus(const char *aStatusMsg)
 {
   nsresult  rv = NS_ERROR_FAILURE;
 
@@ -704,7 +704,7 @@ NS_IMETHODIMP nsPluginInstanceOwner :: ShowStatus(const char *aStatusMsg)
   return rv;
 }
 
-NS_IMETHODIMP nsPluginInstanceOwner :: Init(PluginViewerImpl *aViewer, nsIWidget *aWindow)
+NS_IMETHODIMP pluginInstanceOwner :: Init(PluginViewerImpl *aViewer, nsIWidget *aWindow)
 {
   //do not addref
   mWindow = aWindow;