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 | cfff71f4ef05fde3ffc1cb4b5b76f37e0da1a328 (patch) | |
| tree | 9a321f9e0de20010f1b6404c37f8f704e33711a6 /server-tools | |
| parent | a10c825f34077f56fbdf0d662791f0e7781a66f0 (diff) | |
| download | mariadb-git-cfff71f4ef05fde3ffc1cb4b5b76f37e0da1a328.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 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/IMService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/IMService.cpp b/server-tools/instance-manager/IMService.cpp index 7a876a5117d..679a30ec4e4 100644 --- a/server-tools/instance-manager/IMService.cpp +++ b/server-tools/instance-manager/IMService.cpp @@ -13,7 +13,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <windows.h> +#include <winsock2.h> #include <signal.h> #include "log.h" #include "options.h" |