Cleanup Windows includes
This commit is contained in:
parent
692eab1c71
commit
c19ed5938b
4 changed files with 13 additions and 7 deletions
|
@ -20,6 +20,7 @@
|
||||||
#include "nel/misc/common.h"
|
#include "nel/misc/common.h"
|
||||||
|
|
||||||
#ifdef NL_OS_WINDOWS
|
#ifdef NL_OS_WINDOWS
|
||||||
|
# include <ShellAPI.h>
|
||||||
# include <io.h>
|
# include <io.h>
|
||||||
# include <tchar.h>
|
# include <tchar.h>
|
||||||
#elif defined NL_OS_UNIX
|
#elif defined NL_OS_UNIX
|
||||||
|
|
|
@ -42,7 +42,9 @@
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#include <nel/misc/types_nl.h>
|
||||||
|
|
||||||
|
#ifdef NL_OS_WINDOWS
|
||||||
# define WIN32_LEAN_AND_MEAN
|
# define WIN32_LEAN_AND_MEAN
|
||||||
# define _WIN32_WINDOWS 0x0410
|
# define _WIN32_WINDOWS 0x0410
|
||||||
# ifndef _WIN32_WINNT
|
# ifndef _WIN32_WINNT
|
||||||
|
@ -53,7 +55,7 @@
|
||||||
# define NOMINMAX
|
# define NOMINMAX
|
||||||
# endif
|
# endif
|
||||||
# include <WinSock2.h>
|
# include <WinSock2.h>
|
||||||
# include <windows.h>
|
# include <Windows.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // NL_STDMISC_H
|
#endif // NL_STDMISC_H
|
||||||
|
|
|
@ -18,11 +18,12 @@
|
||||||
#include "nel/misc/system_utils.h"
|
#include "nel/misc/system_utils.h"
|
||||||
|
|
||||||
#ifdef NL_OS_WINDOWS
|
#ifdef NL_OS_WINDOWS
|
||||||
#ifdef _WIN32_WINNT_WIN7
|
# include <ObjBase.h>
|
||||||
|
# ifdef _WIN32_WINNT_WIN7
|
||||||
// only supported by Windows 7 Platform SDK
|
// only supported by Windows 7 Platform SDK
|
||||||
#include <ShObjIdl.h>
|
# include <ShObjIdl.h>
|
||||||
#define TASKBAR_PROGRESS 1
|
# define TASKBAR_PROGRESS 1
|
||||||
#endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef DEBUG_NEW
|
#ifdef DEBUG_NEW
|
||||||
|
|
|
@ -20,7 +20,9 @@
|
||||||
#include "nel/misc/sstring.h"
|
#include "nel/misc/sstring.h"
|
||||||
#include "nel/misc/thread.h"
|
#include "nel/misc/thread.h"
|
||||||
|
|
||||||
#if defined (NL_OS_UNIX)
|
#ifdef NL_OS_WINDOWS
|
||||||
|
# include <MMSystem.h>
|
||||||
|
#elif defined (NL_OS_UNIX)
|
||||||
# include <sys/time.h>
|
# include <sys/time.h>
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue