AIX portability fixes. (Waqar Malik <waqar@netscape.com>)

network/cache/mkcache.c

@@ -3085,7 +3085,7 @@ NET_WriteCacheFAT(char *filename, XP_Bool final_call)
 {
 #ifdef NU_CACHE
     PR_ASSERT(0);
-#endif;
+#endif
 	net_StoreDiskCacheSize();
 
 	if(!cache_database)

network/main/mkconect.c

@@ -78,7 +78,7 @@
 
 #include <resolv.h>
 
-#if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(DGUX)
+#if defined(HAVE_SYS_FILIO_H)
 #include <sys/filio.h>
 #endif
 

network/main/mksockrw.c

@@ -47,7 +47,7 @@ extern int XP_ERRNO_EWOULDBLOCK;
 
 #include <resolv.h>
 
-#if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(DGUX)
+#if defined(HAVE_SYS_FILIO_H)
 #include <sys/filio.h>
 #endif
 

network/main/mktrace.c

@@ -78,7 +78,7 @@ void NET_NTrace(char *msg, int32 length) {
 
 
 /* #define'd in mktrace.h to TRACEMSG */
-void _MK_TraceMsg(char *fmt, ...) {
+void ns_MK_TraceMsg(char *fmt, ...) {
 	va_list ap;
 	char buf[512];
 

network/main/mktrace.h

@@ -36,10 +36,10 @@ extern PRLogModuleInfo* NETLIB;
 
 PR_BEGIN_EXTERN_C
 extern void NET_NTrace(char *msg, int32 length);
-extern void _MK_TraceMsg(char *fmt, ...);
+extern void ns_MK_TraceMsg(char *fmt, ...);
 PR_END_EXTERN_C
 
-#define TRACEMSG(msg)  _MK_TraceMsg msg
+#define TRACEMSG(msg)  ns_MK_TraceMsg msg
 #else
 #define TRACEMSG(msg)  
 #endif /* DEBUG || NETLIB_TRACE_ON */

network/protocol/ftp/mkftp.c

@@ -65,7 +65,7 @@
 #endif /* XP_OS2 */
 
 #ifdef XP_UNIX
-#if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(DGUX)
+#if defined(HAVE_SYS_FILIO_H)
 #include <sys/filio.h>
 #endif
 #endif /* XP_UNIX */ 

xpcom/base/nsCOMPtr.h

@@ -272,7 +272,7 @@
   #endif
 #endif
 
-#if defined(IRIX)
+#if defined(IRIX) || defined(AIX)
   #define NSCAP_NO_MEMBER_USING_DECLARATIONS
   #define NSCAP_NO_EXPLICIT
   #define NSCAP_NO_NEW_CASTS

xpcom/base/nsDebug.cpp

@@ -57,6 +57,8 @@
 	   }
    #endif // TEMP_MAC_HACK
    //------------------------
+#elif defined(XP_UNIX)
+#include<stdlib.h>
 #endif
 
 

xpcom/glue/nsCOMPtr.h

@@ -272,7 +272,7 @@
   #endif
 #endif
 
-#if defined(IRIX)
+#if defined(IRIX) || defined(AIX)
   #define NSCAP_NO_MEMBER_USING_DECLARATIONS
   #define NSCAP_NO_EXPLICIT
   #define NSCAP_NO_NEW_CASTS

xpcom/glue/nsDebug.cpp

@@ -57,6 +57,8 @@
 	   }
    #endif // TEMP_MAC_HACK
    //------------------------
+#elif defined(XP_UNIX)
+#include<stdlib.h>
 #endif
 
 

xpcom/public/nsCOMPtr.h

@@ -272,7 +272,7 @@
   #endif
 #endif
 
-#if defined(IRIX)
+#if defined(IRIX) || defined(AIX)
   #define NSCAP_NO_MEMBER_USING_DECLARATIONS
   #define NSCAP_NO_EXPLICIT
   #define NSCAP_NO_NEW_CASTS

xpcom/src/nsDebug.cpp

@@ -57,6 +57,8 @@
 	   }
    #endif // TEMP_MAC_HACK
    //------------------------
+#elif defined(XP_UNIX)
+#include<stdlib.h>
 #endif