Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change certain AIX ifdefs to AIX_XLC_364 since these ifdefs are only

Browse Source 
needed for AIX's xlC 3.6.4 compiler.  Add test to configure to check
compiler version.  NOTE: also adding hpux and aix check for keyboardutils.
r=cls@seawood.org
# 119179
This commit is contained in:
jdunn%netscape.com 2002-01-25 15:07:38 +00:00
parent 73d972ca6c
commit cd34d9887d
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.in
View File

@ -3989,6 +3989,17 @@ case "$target" in
fi
fi
AC_SUBST(AIX_SHLIB_BIN)
dnl ========================================================
dnl Figure out if we are using a pre-5.0x version of the
dnl xlC compiler and if so, set flag
dnl ========================================================
if test ! "$GNU_CC" && test "$ac_cv_cpp_reinterpret_cast" = no ; then
CXXFLAGS="$CXXFLAGS -DAIX_XLC_364"
CFLAGS="$CFLAGS -DAIX_XLC_364"
fi
;;
esac

4
layout/generic/nsLineLayout.h
View File

@ -381,7 +381,7 @@ protected:
PerFrameData* mFrameFreeList;
PRInt32 mInitialFramesFreed;
#if defined(AIX) || defined(XP_OS2_VACPP)
#if defined(AIX_XLC_364) || defined(XP_OS2_VACPP)
public:
#endif
struct PerSpanData {
@ -419,7 +419,7 @@ public:
mLastFrame = pfd;
}
};
#if defined(AIX) || defined(XP_OS2_VACPP)
#if defined(AIX_XLC_364) || defined(XP_OS2_VACPP)
protected:
#endif
PerSpanData mSpanDataBuf[NS_LINELAYOUT_NUM_SPANS];

4
layout/html/base/src/nsLineLayout.h
View File

@ -381,7 +381,7 @@ protected:
PerFrameData* mFrameFreeList;
PRInt32 mInitialFramesFreed;
#if defined(AIX) || defined(XP_OS2_VACPP)
#if defined(AIX_XLC_364) || defined(XP_OS2_VACPP)
public:
#endif
struct PerSpanData {
@ -419,7 +419,7 @@ public:
mLastFrame = pfd;
}
};
#if defined(AIX) || defined(XP_OS2_VACPP)
#if defined(AIX_XLC_364) || defined(XP_OS2_VACPP)
protected:
#endif
PerSpanData mSpanDataBuf[NS_LINELAYOUT_NUM_SPANS];

2
widget/src/gtk/nsKeyboardUtils.cpp
View File

@ -18,7 +18,7 @@
#include <X11/Xlib.h>
#ifdef HAVE_X11_XKBLIB_H
# if defined (__digital__) && defined (__unix__)
# if (defined (__digital__) && defined (__unix__)) || defined(_AIX) || defined(__hpux)
# define explicit Explicit
# include <X11/XKBlib.h>
# undef explicit

2
xpcom/base/nscore.h
View File

@ -205,7 +205,7 @@ typedef PRUint32 nsresult;
#define HAVE_CPP_TYPENAME
/* waiting to find out if OS/2 VisualAge participates in autoconf */
#if defined(XP_OS2_VACPP) || defined(AIX) || (defined(IRIX) && !defined(__GNUC__))
#if defined(XP_OS2_VACPP) || defined(AIX_XLC_364) || (defined(IRIX) && !defined(__GNUC__))
#undef HAVE_CPP_TYPENAME
#endif

2
xpcom/glue/nsCOMPtr.h
View File

@ -192,7 +192,7 @@ class nsDerivedSafe : public T
NS_IMETHOD_(nsrefcnt) Release(void);
#endif
#if !defined(XP_OS2_VACPP) && !defined(AIX)
#if !defined(XP_OS2_VACPP) && !defined(AIX_XLC_364)
void operator delete( void*, size_t ); // NOT TO BE IMPLEMENTED
// declaring |operator delete| private makes calling delete on an interface pointer a compile error
#endif