diff options
| author | Daniel Jacobowitz <drow@false.org> | 2002-10-28 18:45:51 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2002-10-28 18:45:51 +0000 |
| commit | b035e841f13368dc60972b4e7570383bda6216c2 (patch) | |
| tree | 0307f07166c2c0b5e7d3285c967014802a82d24d | |
| parent | 74abbb4d1fcaef469ea3977fd45b3bb33bc2c7c5 (diff) | |
| download | cygnal-b035e841f13368dc60972b4e7570383bda6216c2.tar.gz cygnal-b035e841f13368dc60972b4e7570383bda6216c2.tar.bz2 cygnal-b035e841f13368dc60972b4e7570383bda6216c2.zip | |
Merge from mainline.
| -rw-r--r-- | include/ChangeLog | 8 | ||||
| -rw-r--r-- | include/ansidecl.h | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 786e08bcd..2353d9921 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,11 @@ +2002-10-28 Daniel Jacobowitz <drow@mvista.com> + + Merge from mainline: + 2002-10-24 Nathan Tallent <eraxxon@alumni.rice.edu> + * ansidecl.h (__STDC__): Add (__alpha && __cplusplus) to the + list of platform compilers that may look, smell and act + like __STDC__ but that may not define it. + 2002-09-23 Daniel Jacobowitz <drow@mvista.com> Merge from mainline: diff --git a/include/ansidecl.h b/include/ansidecl.h index 9a7c5777f..d169b4f50 100644 --- a/include/ansidecl.h +++ b/include/ansidecl.h @@ -136,10 +136,13 @@ So instead we use the macro below and test it against specific values. */ #define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__) #endif /* GCC_VERSION */ -#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(_WIN32) +#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(_WIN32) || (defined(__alpha) && defined(__cplusplus)) /* All known AIX compilers implement these things (but don't always define __STDC__). The RISC/OS MIPS compiler defines these things in SVR4 mode, but does not define __STDC__. */ +/* eraxxon@alumni.rice.edu: The Compaq C++ compiler, unlike many other + C++ compilers, does not define __STDC__, though it acts as if this + was so. (Verified versions: 5.7, 6.2, 6.3, 6.5) */ #define ANSI_PROTOTYPES 1 #define PTR void * |