diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
| commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
| tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /mysys/my_winthread.c | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'mysys/my_winthread.c')
| -rw-r--r-- | mysys/my_winthread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_winthread.c b/mysys/my_winthread.c index 1ca32d58832..19d4a707062 100644 --- a/mysys/my_winthread.c +++ b/mysys/my_winthread.c @@ -18,7 +18,7 @@ *****************************************************************************/ #if defined (_WIN32) /* SAFE_MUTEX will not work until the thread structure is up to date */ -#warning #include <my_global.h> + #undef SAFE_MUTEX #include "mysys_priv.h" #include <process.h> |