[X2Go-Commits] [pale-moon] 197/294: Remove AIX 1st party code OS checks, part 2

git-admin at x2go.org git-admin at x2go.org
Sat Apr 27 08:58:11 CEST 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch upstream/28.5.0
in repository pale-moon.

commit a2786c051173286c9d7ccee2c3c6a19c15966322
Author: wolfbeast <mcwerewolf at wolfbeast.com>
Date:   Mon Apr 1 00:11:06 2019 +0200

    Remove AIX 1st party code OS checks, part 2
    
    Issue #186
---
 gfx/cairo/libpixman/src/pixman.h | 2 --
 gfx/qcms/qcmstypes.h             | 2 --
 js/src/jstypes.h                 | 8 +-------
 modules/libpref/Preferences.cpp  | 3 ---
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/gfx/cairo/libpixman/src/pixman.h b/gfx/cairo/libpixman/src/pixman.h
index 1cbf62e..23408b0 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 d367791..d5f843f 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 75774e5..6cfb3d4 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 31867ca..c56cad9 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

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git


More information about the x2go-commits mailing list