diff options
| author | Hakan Kuecuekyilmaz <hakan@askmonty.org> | 2010-06-24 22:40:30 +0200 |
|---|---|---|
| committer | Hakan Kuecuekyilmaz <hakan@askmonty.org> | 2010-06-24 22:40:30 +0200 |
| commit | 4ee9e66d87cc9ee265b502f803c6884fa3f45940 (patch) | |
| tree | d4e511782ae72ac7e0f678482f4d8d3f6ce03b4c /include/my_pthread.h | |
| parent | 84074519a590c7843d49529b92ed557e5fa9cd63 (diff) | |
| download | mariadb-git-4ee9e66d87cc9ee265b502f803c6884fa3f45940.tar.gz | |
Make MariaDB compile with VS 2010
Most of the changes are backports from MySQL 5.5. Please note
that the 64-bit build fails with VS 2010 and the 32-bit build
has problems running mysql-test-run.pl.
* Added files for compiling with VS 2010 and added them
to Makefile.am.
* ifdef'ed ETIMEDOUT, because it is defined by VS 2010 now
* Removed not needed /MAP's from cmake files
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 9b01146cdde..ee5a77f0216 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -128,7 +128,9 @@ struct tm *gmtime_r(const time_t *timep,struct tm *tmp); void pthread_exit(void *a); /* was #define pthread_exit(A) ExitThread(A)*/ -#define ETIMEDOUT 145 /* Win32 doesn't have this */ +#ifndef ETIMEDOUT
+#define ETIMEDOUT 145
+#endif #define getpid() GetCurrentThreadId() #define HAVE_LOCALTIME_R 1 #define _REENTRANT 1 |