merge
This commit is contained in:
commit
b09cd066d7
2 changed files with 2 additions and 2 deletions
|
@ -31,9 +31,9 @@
|
|||
# define NOMINMAX
|
||||
# include <WinSock2.h>
|
||||
# include <Windows.h>
|
||||
typedef unsigned long ulong;
|
||||
#endif // NL_OS_WINDOWS
|
||||
|
||||
#include <my_global.h>
|
||||
#include <mysql.h>
|
||||
|
||||
using namespace NLMISC;
|
||||
|
|
|
@ -28,9 +28,9 @@
|
|||
#ifdef NL_OS_WINDOWS
|
||||
# include <WinSock2.h>
|
||||
# include <Windows.h>
|
||||
typedef unsigned long ulong;
|
||||
#endif
|
||||
|
||||
#include <my_global.h>
|
||||
#include <mysql.h>
|
||||
#include <time.h>
|
||||
|
||||
|
|
Loading…
Reference in a new issue