diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-18 13:22:32 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-18 13:22:32 +0200 |
| commit | 5eab19d7a329af61c6c218bf192a85881b51088d (patch) | |
| tree | 3528bf5516292baeb59d3009dd2e876e94eceb91 /include | |
| parent | 2276ca1aef779a003dead2ce80f50ab6a9ae91d9 (diff) | |
| parent | 1d24597ff94a45e714151f3024a013e44a569169 (diff) | |
| download | mariadb-git-5eab19d7a329af61c6c218bf192a85881b51088d.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
CMakeLists.txt:
Auto merged
Makefile.am:
Auto merged
include/my_global.h:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 8 |
1 files changed, 8 insertions, 0 deletions
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 |