From 56daaf0554bea141f79e96c8c1474bf03606b418 Mon Sep 17 00:00:00 2001
From: "pkw%us.ibm.com" <pkw%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 23 Mar 2003 22:29:27 +0000
Subject: [PATCH] Bug 198304 - Installer doesn't build on AIX.
 r=ssu@netscape.com, sr=dveditz@netscape.com

git-svn-id: svn://10.0.0.236/trunk@140115 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/configure.in                                 | 2 +-
 mozilla/xpinstall/wizard/libxpnet/src/nsFTPConn.cpp  | 2 +-
 mozilla/xpinstall/wizard/libxpnet/src/nsSocket.cpp   | 5 ++++-
 mozilla/xpinstall/wizard/unix/src2/mozilla-installer | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mozilla/configure.in b/mozilla/configure.in
index 06fc1857843..58f18e9cc32 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -3610,7 +3610,7 @@ dnl ========================================================
 dnl Installer
 dnl ========================================================
 case "$target_os" in
-    solaris*|linux*|msvc*|mksnt*|cygwin*|mingw*|os2*)
+    aix*|solaris*|linux*|msvc*|mksnt*|cygwin*|mingw*|os2*)
         MOZ_INSTALLER=1
         ;;
 esac
diff --git a/mozilla/xpinstall/wizard/libxpnet/src/nsFTPConn.cpp b/mozilla/xpinstall/wizard/libxpnet/src/nsFTPConn.cpp
index 518e1bd36fa..fe4f589e6c9 100644
--- a/mozilla/xpinstall/wizard/libxpnet/src/nsFTPConn.cpp
+++ b/mozilla/xpinstall/wizard/libxpnet/src/nsFTPConn.cpp
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <sys/stat.h>
 
-#if defined(__unix) || defined(__unix__)
+#if defined(__unix) || defined(__unix__) || defined(_AIX)
 #include <sys/param.h>
 #elif defined(_WINDOWS)
 #include <windows.h>
diff --git a/mozilla/xpinstall/wizard/libxpnet/src/nsSocket.cpp b/mozilla/xpinstall/wizard/libxpnet/src/nsSocket.cpp
index 9aeb912952a..6f34826693e 100644
--- a/mozilla/xpinstall/wizard/libxpnet/src/nsSocket.cpp
+++ b/mozilla/xpinstall/wizard/libxpnet/src/nsSocket.cpp
@@ -28,9 +28,12 @@
 #include <errno.h>
 #include <ctype.h>
 #include <time.h>
+#ifdef _AIX
+#include <strings.h>
+#endif
 
 /* Platform-specific headers for socket functionality */
-#if defined(__unix) || defined(__unix__) || defined(macintosh)
+#if defined(__unix) || defined(__unix__) || defined(macintosh) || defined(_AIX)
 #include <unistd.h>
 #include <netdb.h>
 #include <sys/socket.h>
diff --git a/mozilla/xpinstall/wizard/unix/src2/mozilla-installer b/mozilla/xpinstall/wizard/unix/src2/mozilla-installer
index 0257a60e96c..5d6edbc3c21 100755
--- a/mozilla/xpinstall/wizard/unix/src2/mozilla-installer
+++ b/mozilla/xpinstall/wizard/unix/src2/mozilla-installer
@@ -38,7 +38,7 @@
 
 LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
-export -n MOZILLA_FIVE_HOME
+unset MOZILLA_FIVE_HOME
 
 PATH=.:$PATH
 export PATH