diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-23 12:05:00 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-23 12:05:00 +0200 |
| commit | b3e3c3881e4afde180bb96388237bc336f930644 (patch) | |
| tree | 53496188ad172a5fe9f43df6d79697912b90f8de /include | |
| parent | b873193ab685cae05321aeb27c354baf1a599413 (diff) | |
| parent | 6a05f2af3c14bf6fe7498d3fc11b37d08fc2ccf6 (diff) | |
| download | mariadb-git-b3e3c3881e4afde180bb96388237bc336f930644.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
Makefile.am:
Auto merged
client/mysql_upgrade.c:
Auto merged
sql/mysql_priv.h:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/abi_check | 0 | ||||
| -rw-r--r-- | include/my_global.h | 8 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/abi_check b/include/abi_check deleted file mode 100644 index e69de29bb2d..00000000000 --- a/include/abi_check +++ /dev/null diff --git a/include/my_global.h b/include/my_global.h index 61c2afc541b..800457c0e73 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -86,6 +86,14 @@ #endif #endif /* _WIN32... */ +/* Make it easier to add conditionl code for windows */ +#ifdef __WIN__ +#define IF_WIN(A,B) (A) +#else +#define IF_WIN(A,B) (B) +#endif + + /* Some defines to avoid ifdefs in the code */ #ifndef NETWARE_YIELD #define NETWARE_YIELD |