diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2010-12-01 21:37:03 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2010-12-01 21:37:03 +0100 |
| commit | c87923dc2d3f6b5e96d51957937be8a5b343ab51 (patch) | |
| tree | b2aa4348ad143b02bb0c44e1c3adee989bfd4a85 /include | |
| parent | 6f279f40145624c1ffab06c63521f96ce4ac3a02 (diff) | |
| download | mariadb-git-c87923dc2d3f6b5e96d51957937be8a5b343ab51.tar.gz | |
Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings
- Remove all mentioning of /MAP /MAPINFO link options (does not work in VS2010).
Remove map files from packaging.
- Fix warning about ETIMEDOUT being redefined.
- Fix warning about FSP_EXTENT_SIZE in xtradb (32/64 bit right shift mismatch)
- Silence warnings coming from generated code (flex/bison) in xtradb/innodb_plugin.
- Be nice to people without cygwin (me) and add win/configure-mariadb.bat with options suitable for quick compilation, e.g no embedded
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index cadde5df06a..9ada1d90712 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -127,8 +127,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 /* Win32 doesn't have this */ +#endif #define getpid() GetCurrentThreadId() #define HAVE_LOCALTIME_R 1 #define _REENTRANT 1 |