From 16659349cb65337d0102be6091cd0a2239f5395b Mon Sep 17 00:00:00 2001 From: "ramiro%netscape.com" Date: Sat, 6 Mar 1999 15:09:48 +0000 Subject: [PATCH] Latest AIX fixes from waqar@netscape.com. git-svn-id: svn://10.0.0.236/trunk@23064 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/configure.in | 4 +--- mozilla/sun-java/stubs/include/typedefs_md.h | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mozilla/configure.in b/mozilla/configure.in index c386c5ac0e5..2d5fdf386e8 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -140,10 +140,8 @@ case "$target" in MKSHLIB_FORCE_ALL='' MKSHLIB_UNFORCE_ALL='' if [ test "$GNU_CC" != 1 ]; then - AIX_DEFINES='-D_THREAD_SAFE -D_REENTRANT -DPIC' - AIX_CFLAGS='-brtl -O -qtune=604 -qlanglvl=extended -qflag=w:w' DSO_LDOPTS='-ldl -bM:SRE -brtl -berok -bexpall -bnoentry -L$(DIST)/lib' - DSO_CFLAGS='$(AIX_DEFINES) $(AIX_CFLAGS)' + DSO_CFLAGS='-DPIC -brtl -O -qnortti -qflag=w:w' fi dnl MKSHLIB='$(LD) $(DSO_LDOPTS)' MKSHLIB='/usr/ibmcxx/bin/makeC++SharedLib_r -p1 -brtl -berok --' diff --git a/mozilla/sun-java/stubs/include/typedefs_md.h b/mozilla/sun-java/stubs/include/typedefs_md.h index 5e17ac535e7..19fea408316 100644 --- a/mozilla/sun-java/stubs/include/typedefs_md.h +++ b/mozilla/sun-java/stubs/include/typedefs_md.h @@ -28,12 +28,12 @@ PR_BEGIN_EXTERN_C -#if (defined(__sun) && !defined(SOLARIS2_6)) || defined(HPUX9) || defined(HPUX10_10) || defined(XP_PC) || defined(AIX) || defined(OSF1) || defined(XP_MAC) || defined(SONY) || defined(SNI) || defined(UNIXWARE) || defined(LINUX) || defined(DGUX) +#if (defined(__sun) && !defined(SOLARIS2_6)) || defined(HPUX9) || defined(HPUX10_10) || defined(XP_PC) || !defined(AIX) || defined(OSF1) || defined(XP_MAC) || defined(SONY) || defined(SNI) || defined(UNIXWARE) || defined(LINUX) || defined(DGUX) typedef int16 int16_t; typedef int32 int32_t; #endif -#if !defined(IRIX6_2) && !defined(IRIX6_3) && !defined(SOLARIS2_6) && !defined(HPUX10_20) && !defined(HPUX10_30) && !defined(HPUX11) +#if !defined(IRIX6_2) && !defined(IRIX6_3) && !defined(SOLARIS2_6) && !defined(HPUX10_20) && !defined(HPUX10_30) && !defined(HPUX11) && !defined(AIX) typedef uint16 uint16_t; #ifndef _UINT32_T #define _UINT32_T @@ -43,7 +43,7 @@ typedef uint32 uint32_t; typedef prword_t uintVP_t; /* unsigned that is same size as a void pointer */ -#if !defined(BSDI) && !defined(IRIX6_2) && !defined(IRIX6_3) && !defined(LINUX) && !defined(SOLARIS2_6) && !defined(HPUX10_20) && !defined(HPUX10_30) && !defined(HPUX11) && !defined(RHAPSODY) && !defined(NETBSD) +#if !defined(BSDI) && !defined(IRIX6_2) && !defined(IRIX6_3) && !defined(LINUX) && !defined(SOLARIS2_6) && !defined(HPUX10_20) && !defined(HPUX10_30) && !defined(HPUX11) && !defined(RHAPSODY) && !defined(NETBSD) && !defined(AIX) typedef int64 int64_t; #else /*