database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge MariaDB 10.0-base to MariaDB 10.0

Browse Source
This commit is contained in:
unknown
2012-12-18 15:01:58 +01:00
parent 4923d19b7c 6c3de76ad5
commit 701419b02f
225 changed files with 10932 additions and 1679 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 /* MY_GLOBAL_INCLUDED */