diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-21 23:07:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-21 23:07:13 +0200 |
| commit | aeaa112edbf40f17c7978642539443544241185d (patch) | |
| tree | 97faebc5269e23af60a451907271bfa11643f353 /include | |
| parent | b3223453f7e4398ff0f55471ac7dc4aecf2caf8d (diff) | |
| download | mariadb-git-aeaa112edbf40f17c7978642539443544241185d.tar.gz | |
fixes for windows
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 3 | ||||
| -rw-r--r-- | include/my_pthread.h | 15 | ||||
| -rw-r--r-- | include/mysql/plugin.h | 6 | ||||
| -rw-r--r-- | include/mysql/plugin_auth_common.h | 4 | ||||
| -rw-r--r-- | include/mysql_com.h | 3 |
5 files changed, 10 insertions, 21 deletions
diff --git a/include/my_base.h b/include/my_base.h index fad2cd99d55..c71df96dbed 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -19,8 +19,6 @@ #ifndef _my_base_h #define _my_base_h -#ifndef stdin /* Included first in handler */ -#define CHSIZE_USED #include <my_global.h> #include <my_dir.h> /* This includes types */ #include <my_sys.h> @@ -31,7 +29,6 @@ #define EOVERFLOW 84 #endif -#endif /* stdin */ #include <my_list.h> /* The following is bits in the flag parameter to ha_open() */ diff --git a/include/my_pthread.h b/include/my_pthread.h index 9f851db4209..21c85c633d6 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -91,21 +91,6 @@ struct timespec { long tv_nsec; }; - -/** - Compare two timespec structs. - - @retval 1 If TS1 ends after TS2. - - @retval 0 If TS1 is equal to TS2. - - @retval -1 If TS1 ends before TS2. -*/ -#define cmp_timespec(TS1, TS2) \ - ((TS1.tv.i64 > TS2.tv.i64) ? 1 : \ - ((TS1.tv.i64 < TS2.tv.i64) ? -1 : 0)) - - int win_pthread_mutex_trylock(pthread_mutex_t *mutex); int pthread_create(pthread_t *, const pthread_attr_t *, pthread_handler, void *); int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr); diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 32228b63428..2e5e6b5c9b0 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -122,9 +122,9 @@ int PSIZE= sizeof(struct st_mysql_plugin); \ struct st_mysql_plugin DECLS[]= { #define MARIA_DECLARE_PLUGIN__(NAME, VERSION, PSIZE, DECLS) \ -int VERSION= MARIA_PLUGIN_INTERFACE_VERSION; \ -int PSIZE= sizeof(struct st_maria_plugin); \ -struct st_maria_plugin DECLS[]= { +MYSQL_PLUGIN_EXPORT int VERSION= MARIA_PLUGIN_INTERFACE_VERSION; \ +MYSQL_PLUGIN_EXPORT int PSIZE= sizeof(struct st_maria_plugin); \ +MYSQL_PLUGIN_EXPORT struct st_maria_plugin DECLS[]= { #else #define __MYSQL_DECLARE_PLUGIN(NAME, VERSION, PSIZE, DECLS) \ diff --git a/include/mysql/plugin_auth_common.h b/include/mysql/plugin_auth_common.h index 3c87fe7e094..2f6642abac1 100644 --- a/include/mysql/plugin_auth_common.h +++ b/include/mysql/plugin_auth_common.h @@ -15,6 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifdef _WIN32 +#include <windows.h> +#endif + /** @file diff --git a/include/mysql_com.h b/include/mysql_com.h index e4f065e3e93..1ffb6557117 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -56,6 +56,9 @@ #define LOCAL_HOST "localhost" #define LOCAL_HOST_NAMEDPIPE "." +#ifdef _WIN32 +#include <ws2tcpip.h> +#endif #if defined(__WIN__) && !defined( _CUSTOMCONFIG_) #define MYSQL_NAMEDPIPE "MySQL" |