From 479882883f5235d3ad8cda59ee8afe1d090e13bf Mon Sep 17 00:00:00 2001
From: "briano%netscape.com"
 <briano%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 15 Nov 1998 08:39:27 +0000
Subject: [PATCH] Fixes for AIXV3.

git-svn-id: svn://10.0.0.236/trunk@14703 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/include/xp_mcom.h | 4 +++-
 mozilla/include/xp_str.h  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mozilla/include/xp_mcom.h b/mozilla/include/xp_mcom.h
index 10c3ad8ced2..e3242739820 100644
--- a/mozilla/include/xp_mcom.h
+++ b/mozilla/include/xp_mcom.h
@@ -85,14 +85,16 @@ XP_END_PROTOS
 #endif
 
 
-#if !defined(XP_WIN) && !defined(XP_OS2) && !(defined(__GLIBC__) && __GLIBC__ >= 2)
+#if !defined(XP_WIN) && !defined(XP_OS2) && !(defined(__GLIBC__) && __GLIBC__ >= 2) && !defined(AIXV3)
 /* strdup is not an ANSI function */
 XP_BEGIN_PROTOS
 extern char * strdup (const char * s);
 XP_END_PROTOS
 #endif
 
+#ifndef QNX
 #include <memory.h>
+#endif
 
 #define XP_STRDUP(s)              strdup((s))
 #define XP_MEMCPY(d, s, n)        memcpy((d), (s), (n))
diff --git a/mozilla/include/xp_str.h b/mozilla/include/xp_str.h
index 6eb24fcbf70..4932dbf16eb 100644
--- a/mozilla/include/xp_str.h
+++ b/mozilla/include/xp_str.h
@@ -62,7 +62,7 @@
 #endif
 
 
-#if !defined(XP_WIN) && !defined(XP_OS2) && !(defined(__GLIBC__) && __GLIBC__ >= 2)
+#if !defined(XP_WIN) && !defined(XP_OS2) && !(defined(__GLIBC__) && __GLIBC__ >= 2) && !defined(AIXV3)
 	/* strdup is not an ANSI function */
 	XP_BEGIN_PROTOS
 	extern char * strdup (const char * s);