bzr commit into mysql-trunk branch (build:3130)

[MySQL Build Team]

#At file:///store/bteam/bzr/mysql-5.5.3-m3-release-post-fix/ based on revid:joerg@stripped

 3130 Daniel Fischer	2010-04-16
      Make the libraries we produce on Windows actually usable

    modified:
      include/my_global.h
      scripts/make_win_bin_dist
=== modified file 'include/my_global.h'
--- a/include/my_global.h	2010-02-25 12:23:43 +0000
+++ b/include/my_global.h	2010-04-16 08:27:18 +0000
@@ -18,6 +18,11 @@
 #ifndef _global_h
 #define _global_h
 
+/* Client library users on Windows need this macro defined here. */
+#if !defined(__WIN__) && defined(_WIN32)
+#define __WIN__
+#endif
+
 /*
   InnoDB depends on some MySQL internals which other plugins should not
   need.  This is because of InnoDB's foreign key support, "safe" binlog
@@ -1089,10 +1094,14 @@ typedef long long	my_ptrdiff_t;
 #define HUGE_PTR
 #endif
 #endif
-#if defined(__IBMC__) || defined(__IBMCPP__)
-/* This was  _System _Export but caused a lot of warnings on _AIX43 */
-#define STDCALL
-#elif !defined( STDCALL)
+
+#ifdef STDCALL
+#undef STDCALL
+#endif
+
+#ifdef _WIN32
+#define STDCALL __stdcall
+#else
 #define STDCALL
 #endif
 

=== modified file 'scripts/make_win_bin_dist'
--- a/scripts/make_win_bin_dist	2010-03-22 15:02:31 +0000
+++ b/scripts/make_win_bin_dist	2010-04-16 08:27:18 +0000
@@ -249,6 +249,7 @@ cp include/mysql.h \
    include/decimal.h \
    include/errmsg.h \
    include/my_global.h \
+   include/my_config.h \
    include/my_net.h \
    include/my_getopt.h \
    include/sslopt-longopts.h \


Attachment: [text/bzr-bundle] bzr/[e-mail]