diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2010-12-02 16:19:28 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2010-12-02 16:19:28 +0100 |
| commit | 8b4b8c8e65cb25121ae6c7274e6e190932157d8b (patch) | |
| tree | 9b22d14d8daa64eda401f894f61603b8f2049f56 /include | |
| parent | 1a2df3f4eb403875406a72c39efce8a2fb6d32ac (diff) | |
| parent | ea728806590f856eaa49ea0111dd794b484f7d0d (diff) | |
| download | mariadb-git-8b4b8c8e65cb25121ae6c7274e6e190932157d8b.tar.gz | |
merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 169225c1e9b..ef17ad48cb6 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -128,8 +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)*/ -#ifndef ETIMEDOUT
-#define ETIMEDOUT 145
+ +#ifndef ETIMEDOUT +#define ETIMEDOUT 145 /* Win32 doesn't have this */ #endif #define getpid() GetCurrentThreadId() #define HAVE_LOCALTIME_R 1 |