database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-3868 : windows client compilation issues

Browse Source 
Avoid inclusion of Windows headers via client API headers, since it traditionally
lead to different  subtle compilation problems. Instead define my_socket in a way that is compatible with SOCKET (unsigned int in 32 bit , unsigned longlong in 64 bit)
This commit is contained in:
Vladislav Vaintroub
2012-11-20 15:24:39 +01:00
parent 4d44261052
commit a52270d7ac
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/mysql.h
View File

@ -47,9 +47,6 @@ extern "C" {
#ifndef MYSQL_ABI_CHECK
#include <sys/types.h>
#endif
#ifdef __LCC__
#include <winsock2.h> /* For windows */
#endif
typedef char my_bool;
#if (defined(_WIN32) || defined(_WIN64)) && !defined(__WIN__)
#define __WIN__
@ -61,11 +58,13 @@ typedef char my_bool;
#endif
#ifndef my_socket_defined
#ifdef __WIN__
#define my_socket SOCKET
#if defined (_WIN64)
#define my_socket unsigned long long
#elif defined (_WIN32)
#define my_socket unsigned int
#else
typedef int my_socket;
#endif /* __WIN__ */
#endif /* _WIN64 */
#endif /* my_socket_defined */
#endif /* _global_h */