Merge siva.hindu.god:/usr/home/tim/m/bk/mrg/50

into siva.hindu.god:/usr/home/tim/m/bk/mrg/51

Merge siva.hindu.god:/usr/home/tim/m/bk/mrg/50
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
04538cd6 · tsmith/tim@siva.hindu.god · 26185e56 · 5ffa3e1b · 04538cd6
Commit 04538cd6 authored Sep 30, 2006 by tsmith/tim@siva.hindu.god
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/my_global.h include/my_global.h +1 -1

No files found.
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -565,7 +565,7 @@ typedef unsigned short ushort;
 #  define __attribute__(A)
 # elif GCC_VERSION < 2008
 #  define __attribute__(A)
-# elif defined(__cplusplus__) && GCC_VERSION < 3004
+# elif defined(__cplusplus) && GCC_VERSION < 3004
 #  define __attribute__(A)
 # endif
 #endif