diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-12-04 23:18:46 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-12-04 23:18:46 +0200 |
| commit | bafceea14f1bcc7edda379dcd874e21e2c173398 (patch) | |
| tree | 295787e7712d88e743e973e61d9e5326e2e92fdd /include | |
| parent | 8b4b8c8e65cb25121ae6c7274e6e190932157d8b (diff) | |
| parent | dfefc15db49c367dd59d790bbd50311ec423f5f4 (diff) | |
| download | mariadb-git-bafceea14f1bcc7edda379dcd874e21e2c173398.tar.gz | |
Automatic merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index ef17ad48cb6..5cf6c5d5fac 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -128,7 +128,6 @@ 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 /* Win32 doesn't have this */ #endif |