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

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


include/my_global.h:
  Auto merged
This commit is contained in:
unknown 2006-09-30 02:01:07 -06:00
commit fb6c45ebf8

View file

@ -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