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

Cleanup Windows includes

Browse source
This commit is contained in:
kaetemi 2015-02-24 12:47:54 +01:00
parent 692eab1c71
commit c19ed5938b
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/src/misc/common.cpp
View file

@ -20,6 +20,7 @@
#include "nel/misc/common.h"
#ifdef NL_OS_WINDOWS
# include <ShellAPI.h>
# include <io.h>
# include <tchar.h>
#elif defined NL_OS_UNIX

6
code/nel/src/misc/stdmisc.h
View file

@ -42,7 +42,9 @@
#include <utility>
#include <vector>
#ifdef _WIN32
#include <nel/misc/types_nl.h>
#ifdef NL_OS_WINDOWS
# define WIN32_LEAN_AND_MEAN
# define _WIN32_WINDOWS 0x0410
# ifndef _WIN32_WINNT
@ -53,7 +55,7 @@
# define NOMINMAX
# endif
# include <WinSock2.h>
# include <windows.h>
# include <Windows.h>
#endif
#endif // NL_STDMISC_H

9
code/nel/src/misc/system_utils.cpp
View file

@ -18,11 +18,12 @@
#include "nel/misc/system_utils.h"
#ifdef NL_OS_WINDOWS
#ifdef _WIN32_WINNT_WIN7
# include <ObjBase.h>
# ifdef _WIN32_WINNT_WIN7
// only supported by Windows 7 Platform SDK
#include <ShObjIdl.h>
#define TASKBAR_PROGRESS 1
#endif
# include <ShObjIdl.h>
# define TASKBAR_PROGRESS 1
# endif
#endif
#ifdef DEBUG_NEW

4
code/nel/src/misc/time_nl.cpp
View file

@ -20,7 +20,9 @@
#include "nel/misc/sstring.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 <unistd.h>
#endif