List:Commits« Previous MessageNext Message »
From:Jonathan Perkin Date:April 29 2009 9:11pm
Subject:bzr commit into mysql-6.0 branch (jperkin:2702)
View as plain text  
#At file:///net/helheim/store/bteam/bzr/mysql-6.0.11-alpha-release/

 2702 Jonathan Perkin	2009-04-29
      Don't redefine __func__
      modified:
        include/my_global.h

=== modified file 'include/my_global.h'
--- a/include/my_global.h	2009-04-14 23:53:44 +0000
+++ b/include/my_global.h	2009-04-29 21:10:55 +0000
@@ -1607,25 +1607,26 @@ inline void  operator delete[](void*, vo
 #endif
 
 /* Provide __func__ macro definition for platforms that miss it. */
-#if __STDC_VERSION__ < 199901L
-#  if __GNUC__ >= 2
-#    define __func__ __FUNCTION__
+#ifndef __func__
+#  if __STDC_VERSION__ < 199901L
+#    if __GNUC__ >= 2
+#      define __func__ __FUNCTION__
+#    else
+#      define __func__ "<unknown>"
+#    endif
+#  elif defined(_MSC_VER)
+#    if _MSC_VER < 1300
+#      define __func__ "<unknown>"
+#    else
+#      define __func__ __FUNCTION__
+#    endif
+#  elif defined(__BORLANDC__)
+#    define __func__ __FUNC__
 #  else
 #    define __func__ "<unknown>"
 #  endif
-#elif defined(_MSC_VER)
-#  if _MSC_VER < 1300
-#    define __func__ "<unknown>"
-#  else
-#    define __func__ __FUNCTION__
-#  endif
-#elif defined(__BORLANDC__)
-#  define __func__ __FUNC__
-#else
-#  define __func__ "<unknown>"
 #endif
 
-
 /* 
   MYSQL_PLUGIN_IMPORT macro is used to export mysqld data
   (i.e variables) for usage in storage engine loadable plugins.

Thread
bzr commit into mysql-6.0 branch (jperkin:2702) Jonathan Perkin29 Apr