database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge danny's Windows fix from release branch

Browse Source
This commit is contained in:
Jonathan Perkin
2010-05-11 11:11:00 +02:00
parent 5230aa7a5e 29f098f2d3
commit 5492914383
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/my_global.h
View File

@ -18,6 +18,11 @@
#ifndef _global_h #ifndef _global_h
#define _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 InnoDB depends on some MySQL internals which other plugins should not
need. This is because of InnoDB's foreign key support, "safe" binlog 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 #define HUGE_PTR
#endif #endif
#endif #endif
#if defined(__IBMC__) || defined(__IBMCPP__)
/* This was _System _Export but caused a lot of warnings on _AIX43 */ #ifdef STDCALL
#define STDCALL #undef STDCALL
#elif !defined( STDCALL) #endif
#ifdef _WIN32
#define STDCALL __stdcall
#else
#define STDCALL #define STDCALL
#endif #endif

1
scripts/make_win_bin_dist
View File

@ -249,6 +249,7 @@ cp include/mysql.h \
include/decimal.h \ include/decimal.h \
include/errmsg.h \ include/errmsg.h \
include/my_global.h \ include/my_global.h \
include/my_config.h \
include/my_net.h \ include/my_net.h \
include/my_getopt.h \ include/my_getopt.h \
include/sslopt-longopts.h \ include/sslopt-longopts.h \