Connector/ODBC 3.51 commit: r90 - in trunk: myodbc3 myodbc3m

[jwinstead]

Modified:
   trunk/myodbc3/myutil.h
   trunk/myodbc3m/myodbc3m.h
Log:
Revert __attribute__ definition (we'll pick up the server's from my_global.h)
but add one to myodbc3m, since it doesn't include the server headers.


Modified: trunk/myodbc3/myutil.h
===================================================================
--- trunk/myodbc3/myutil.h	2006-09-11 20:08:28 UTC (rev 89)
+++ trunk/myodbc3/myutil.h	2006-09-11 21:11:13 UTC (rev 90)
@@ -31,20 +31,7 @@
 #ifndef __MYUTIL_H__
 #define __MYUTIL_H__
 
-#ifdef __GNUC__
-# ifndef GCC_VERSION
-#  define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
-# endif
-#endif
-
 /*
-  Disable __attribute__() on GCC < 2.7 and non-GCC compilers.
-*/
-#if !defined(__attribute__) && (!defined(__GNUC__) || GCC_VERSION < 2007)
-#define __attribute__(A)
-#endif
-
-/*
   Utility macros
 */
 

Modified: trunk/myodbc3m/myodbc3m.h
===================================================================
--- trunk/myodbc3m/myodbc3m.h	2006-09-11 20:08:28 UTC (rev 89)
+++ trunk/myodbc3m/myodbc3m.h	2006-09-11 21:11:13 UTC (rev 90)
@@ -10,6 +10,11 @@
 
 #include <sqlext.h>
 
+/* Disable _attribute__ on non-gcc compilers. */
+#if !defined(__attribute__) && !define(__GNUC__)
+# define __attribute__(arg)
+#endif
+
 #ifdef HAVE_STRTOL
 
 char *szSyntax =