Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

merge

Browse source
This commit is contained in:
rti 2012-05-24 16:35:28 +02:00
commit b09cd066d7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/server/src/monitor_service/service_main.cpp
View file

@ -31,9 +31,9 @@
# define NOMINMAX # define NOMINMAX
# include <WinSock2.h> # include <WinSock2.h>
# include <Windows.h> # include <Windows.h>
typedef unsigned long ulong;
#endif // NL_OS_WINDOWS #endif // NL_OS_WINDOWS
#include <my_global.h>
#include <mysql.h> #include <mysql.h>
using namespace NLMISC; using namespace NLMISC;

2
code/ryzom/server/src/server_share/mysql_wrapper.h
View file

@ -28,9 +28,9 @@
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
# include <WinSock2.h> # include <WinSock2.h>
# include <Windows.h> # include <Windows.h>
typedef unsigned long ulong;
#endif #endif
#include <my_global.h>
#include <mysql.h> #include <mysql.h>
#include <time.h> #include <time.h>