Fixed: Some Windows.h inclusions

This commit is contained in:
kervala 2012-05-21 10:03:08 +02:00
parent 8d85a2f727
commit 58adf0a6f9
5 changed files with 24 additions and 2 deletions

View file

@ -22,8 +22,9 @@
#include <vector>
#ifdef NL_OS_WINDOWS
# define NOMINMAX
# include <windows.h>
struct HINSTANCE__;
typedef struct HINSTANCE__ *HINSTANCE;
typedef HINSTANCE HMODULE; /* HMODULEs can be used in place of HINSTANCEs */
#else
# include <dlfcn.h>
#endif

View file

@ -42,6 +42,20 @@ namespace NLMISC
class CWindowDisplayer;
}
#if defined(NL_OS_WINDOWS) && defined(_WINDOWS)
#ifndef WINAPI
#define WINAPI __stdcall
#endif
#ifndef APIENTRY
#define APIENTRY WINAPI
#endif
struct HINSTANCE__;
typedef struct HINSTANCE__ *HINSTANCE;
typedef char CHAR;
typedef CHAR *LPSTR;
#endif
namespace NLNET
{

View file

@ -55,6 +55,7 @@
#ifdef NL_OS_WINDOWS
#define NOMINMAX
#include <WinSock2.h>
#include <windows.h>
#endif

View file

@ -22,6 +22,10 @@
#include "source_fmod.h"
#include "buffer_fmod.h"
#ifdef NL_OS_WINDOWS
#include <Windows.h>
#endif
using namespace std;
using namespace NLMISC;

View file

@ -34,6 +34,8 @@ using namespace std;
#ifdef _MSC_VER
#include <Windows.h>
/** A special stream buffer that output in the 'output debug string' feature of windows.
*/
class CDebugOutput : public streambuf