List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:September 20 2011 8:15am
Subject:bzr push into mysql-trunk branch (tor.didriksen:3441 to 3442)
View as plain text  
 3442 Tor Didriksen	2011-09-20
      Remove the ifdef STANDARD stuff
      (the flag was removed from configure on Fri 2006-03-10 12:12:08 +0100)
      
      Include stl headers *after* my_global, trying to fix broken build on solaris:
      
      the build broke on 
      SunOS takk 5.10 Generic_120011-14 sun4u sparc SUNW,SPARC-Enterprise
      
      "/usr/include/floatingpoint.h", line 164: Error: FILE is not defined.
      
      in /usr/include/floatingpoint.h
      we find this spaghetti:
      
      #ifdef __STDC__
      #include <stdio_tag.h>
      #if __cplusplus >= 199711L
      namespace std {
      #endif
      #if !defined(_FILEDEFED) || __cplusplus >= 199711L
      #define _FILEDEFED
      typedef __FILE FILE;
      #endif
      #if __cplusplus >= 199711L
      } // namespace std
      #define _FLOATINGPOINT_FILE     std::FILE
      #else
      #define _FLOATINGPOINT_FILE     FILE
      #endif
      #endif  /* defined(__STDC__) */

    modified:
      sql/udf_example.cc
 3441 Tor Didriksen	2011-09-19
      enable exceptions (got linkage error on win32 when using stl code in mysqld.cc)

    modified:
      cmake/os/Windows.cmake
=== modified file 'sql/udf_example.cc'
--- a/sql/udf_example.cc	2011-09-19 14:27:04 +0000
+++ b/sql/udf_example.cc	2011-09-20 08:07:57 +0000
@@ -111,25 +111,13 @@
 **
 */
 
+#include <my_global.h>
+#include <my_sys.h>
+
 #include <new>
 #include <vector>
 #include <algorithm>
 
-#ifdef STANDARD
-/* STANDARD is defined, don't use any mysql functions */
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#ifdef __WIN__
-typedef unsigned __int64 ulonglong;	/* Microsofts 64 bit types */
-typedef __int64 longlong;
-#else
-typedef unsigned long long ulonglong;
-typedef long long longlong;
-#endif /*__WIN__*/
-#else
-#include <my_global.h>
-#include <my_sys.h>
 #if defined(MYSQL_SERVER)
 #include <m_string.h>		/* To get strmov() */
 #else
@@ -137,7 +125,7 @@ typedef long long longlong;
 #include <string.h>
 #define strmov(a,b) stpcpy(a,b)
 #endif
-#endif
+
 #include <mysql.h>
 #include <ctype.h>
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (tor.didriksen:3441 to 3442) Tor Didriksen20 Sep