Commit fb6c45eb authored by unknown's avatar unknown
Browse files

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
parents 85aba1c9 38a15a31

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -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