diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-23 22:48:15 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-23 22:48:15 +0200 |
| commit | 338cb6a83644debcb4fae9a8bdd8880294b30383 (patch) | |
| tree | 9a321f9e0de20010f1b6404c37f8f704e33711a6 /include | |
| parent | 069362205ccf28a24bc1d9f45d05cccfc1c40cac (diff) | |
| download | mariadb-git-338cb6a83644debcb4fae9a8bdd8880294b30383.tar.gz | |
Fixed compilations problems and warnings on windows
extra/yassl/include/openssl/ssl.h:
Move things up to avoid problems with defines in winsock2
extra/yassl/include/socket_wrapper.hpp:
Don't include winsock2.h twice
include/config-win.h:
Use winsock2.h instead of winsock.h
(winsock2.h must be included before windows.h and will automaticly include windows.h)
include/mysql.h:
Use winsock2.h
libmysqld/examples/builder-sample/emb_samples.cpp:
Use winsock2.h
server-tools/instance-manager/IMService.cpp:
Use winsock2.h
sql/item_strfunc.cc:
Remove duplicate include
sql/lex.h:
Fixed conflict with external GROUP define
sql/net_serv.cc:
winsock.h is already included in my_global.h
sql/sql_class.cc:
Fixed compiler warning on windows
sql/sql_table.cc:
Fixed compiler warning
sql/sql_yacc.yy:
Fixed conflict with external GROUP define
sql/udf_example.c:
Use winsock2 instead of winsock.h
win/README:
Updated readme
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 2 | ||||
| -rw-r--r-- | include/mysql.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/config-win.h b/include/config-win.h index 101156596dc..6735ae1aba1 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -27,7 +27,7 @@ functions */ #endif #include <sys/locking.h> -#include <windows.h> +#include <winsock2.h> #include <math.h> /* Because of rint() */ #include <fcntl.h> #include <io.h> diff --git a/include/mysql.h b/include/mysql.h index aa54a62dca4..f76ae10ca16 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -42,7 +42,7 @@ extern "C" { #ifndef _global_h /* If not standard header */ #include <sys/types.h> #ifdef __LCC__ -#include <winsock.h> /* For windows */ +#include <winsock2.h> /* For windows */ #endif typedef char my_bool; #if (defined(_WIN32) || defined(_WIN64)) && !defined(__WIN__) |