mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
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
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
#pragma hdrstop
|
||||
|
||||
#include "emb_samples.h"
|
||||
#include <winsock.h>
|
||||
#include <winsock2.h>
|
||||
#include <mysql.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
|
Reference in New Issue
Block a user