diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-12-04 16:32:42 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-12-04 16:32:42 +0200 |
| commit | a9243256561811436245c846b1ad05812e0a62e3 (patch) | |
| tree | 075560442ea23458f2ec0f14bb66460900fb5f3a /include | |
| parent | 6426564753a8a023085307a53476e6a5bc7fc03c (diff) | |
| parent | 7fc608619260d6f74e70b990cdf48fff15e9e115 (diff) | |
| download | mariadb-git-a9243256561811436245c846b1ad05812e0a62e3.tar.gz | |
Merge with 5.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 169225c1e9b..9ada1d90712 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -127,9 +127,8 @@ struct tm *gmtime_r(const time_t *timep,struct tm *tmp); void pthread_exit(void *a); /* was #define pthread_exit(A) ExitThread(A)*/ - -#ifndef ETIMEDOUT
-#define ETIMEDOUT 145
+#ifndef ETIMEDOUT +#define ETIMEDOUT 145 /* Win32 doesn't have this */ #endif #define getpid() GetCurrentThreadId() #define HAVE_LOCALTIME_R 1 |