diff options
Diffstat (limited to 'mysql/my_global.h')
| -rw-r--r-- | mysql/my_global.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql/my_global.h b/mysql/my_global.h index ea127a8..03f82d5 100644 --- a/mysql/my_global.h +++ b/mysql/my_global.h @@ -217,8 +217,8 @@ C_MODE_END #ifdef _WIN32 typedef int socket_len_t; typedef int sigset_t; -typedef int mode_t; -typedef SSIZE_T ssize_t; +/* typedef int mode_t; */ +/*typedef SSIZE_T ssize_t;*/ #else typedef socklen_t socket_len_t; #endif @@ -299,7 +299,7 @@ static inline int is_directory_separator(char c) #endif } -/* +/* MY_FILE_MIN is Windows speciality and is used to quickly detect the mismatch of CRT and mysys file IO usage on Windows at runtime. CRT file descriptors can be in the range 0-2047, whereas descriptors returned @@ -317,16 +317,16 @@ static inline int is_directory_separator(char c) #define MY_FILE_MIN 0 #endif -/* +/* MY_NFILE is the default size of my_file_info array. It is larger on Windows, because it all file handles are stored in my_file_info - Default size is 16384 and this should be enough for most cases.If it is not + Default size is 16384 and this should be enough for most cases.If it is not enough, --max-open-files with larger value can be used. For Posix , my_file_info array is only used to store filenames for error reporting and its size is not a limitation for number of open files. -*/ +*/ #ifdef _WIN32 #define MY_NFILE (16384 + MY_FILE_MIN) #else @@ -359,7 +359,7 @@ static inline int is_directory_separator(char c) /* Some defines of functions for portability */ -#if (_WIN32) +#ifdef _WIN32 #if !defined(_WIN64) inline double my_ulonglong2double(unsigned long long value) { @@ -470,7 +470,7 @@ typedef long long my_ptrdiff_t; #define NullS (char *) 0 -#ifdef _WIN32 +#if defined(_WIN32) && (!defined(__MINGW32__) || defined(_WIN64)) #define STDCALL __stdcall #else #define STDCALL @@ -496,9 +496,9 @@ typedef unsigned long uint32; #if !defined(HAVE_ULONG) typedef unsigned long ulong; /* Short for unsigned long */ #endif -/* - Using [unsigned] long long is preferable as [u]longlong because we use - [unsigned] long long unconditionally in many places, +/* + Using [unsigned] long long is preferable as [u]longlong because we use + [unsigned] long long unconditionally in many places, for example in constants with [U]LL suffix. */ typedef unsigned long long int ulonglong; /* ulong or unsigned long long */ @@ -628,7 +628,7 @@ typedef char my_bool; /* Small bool */ #define bool In_C_you_should_use_my_bool_instead() #endif -/* +/* MYSQL_PLUGIN_IMPORT macro is used to export mysqld data (i.e variables) for usage in storage engine loadable plugins. Outside of Windows, it is dummy. |