summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-04-01 00:11:06 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-04-01 00:11:06 +0200
commita2786c051173286c9d7ccee2c3c6a19c15966322 (patch)
treeeb4465c038527e9a48c5125b3afd6b0bb3e90a76
parentb9a8bca64d7a9ae1f950a953ac2985bf7dcc4eff (diff)
downloadUXP-a2786c051173286c9d7ccee2c3c6a19c15966322.tar
UXP-a2786c051173286c9d7ccee2c3c6a19c15966322.tar.gz
UXP-a2786c051173286c9d7ccee2c3c6a19c15966322.tar.lz
UXP-a2786c051173286c9d7ccee2c3c6a19c15966322.tar.xz
UXP-a2786c051173286c9d7ccee2c3c6a19c15966322.zip
Remove AIX 1st party code OS checks, part 2
Issue #186
-rw-r--r--gfx/cairo/libpixman/src/pixman.h2
-rw-r--r--gfx/qcms/qcmstypes.h2
-rw-r--r--js/src/jstypes.h8
-rw-r--r--modules/libpref/Preferences.cpp3
4 files changed, 1 insertions, 14 deletions
diff --git a/gfx/cairo/libpixman/src/pixman.h b/gfx/cairo/libpixman/src/pixman.h
index 1cbf62e21..23408b028 100644
--- a/gfx/cairo/libpixman/src/pixman.h
+++ b/gfx/cairo/libpixman/src/pixman.h
@@ -104,8 +104,6 @@ typedef __int32 int32_t;
typedef unsigned __int32 uint32_t;
typedef __int64 int64_t;
typedef unsigned __int64 uint64_t;
-#elif defined (_AIX)
-# include <sys/inttypes.h>
#else
# include <stdint.h>
#endif
diff --git a/gfx/qcms/qcmstypes.h b/gfx/qcms/qcmstypes.h
index d36779183..d5f843f79 100644
--- a/gfx/qcms/qcmstypes.h
+++ b/gfx/qcms/qcmstypes.h
@@ -38,8 +38,6 @@ typedef unsigned __int64 uintptr_t;
typedef unsigned long uintptr_t;
#endif
-#elif defined (_AIX)
-# include <sys/inttypes.h>
#else
# include <stdint.h>
#endif
diff --git a/js/src/jstypes.h b/js/src/jstypes.h
index 75774e5b8..6cfb3d4ad 100644
--- a/js/src/jstypes.h
+++ b/js/src/jstypes.h
@@ -147,13 +147,7 @@
# define JS_64BIT
# endif
#elif defined(__GNUC__)
-/* Additional GCC defines are when running on Solaris, AIX, and HPUX */
-# if defined(__x86_64__) || defined(__sparcv9) || \
- defined(__64BIT__) || defined(__LP64__)
-# define JS_64BIT
-# endif
-#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) /* Sun Studio C/C++ */
-# if defined(__x86_64) || defined(__sparcv9)
+# if defined(__x86_64__) || defined(__64BIT__)
# define JS_64BIT
# endif
#elif defined(__xlc__) || defined(__xlC__) /* IBM XL C/C++ */
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
index 31867ca0a..c56cad98d 100644
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -1306,9 +1306,6 @@ static nsresult pref_InitInitialObjects()
"winpref.js"
#elif defined(XP_UNIX)
"unix.js"
-#if defined(_AIX)
- , "aix.js"
-#endif
#elif defined(XP_BEOS)
"beos.js"
#endif