Fix mingw32 build by dropping re- and undefs of core types

[lugaru.git] / Source / OpenGL_Windows.cpp

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 5c32c25ecd6d3f1d3da9ce40447b75d8af1503ba..b12cf8b74ebf7d50af9fc1d06f5cea0992ed5682 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -21,29 +21,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 #ifdef WIN32
-#define UINT8 WIN32API_UINT8
-#define UINT16 WIN32API_UINT16
-#define boolean WIN32API_boolean
 #include <windows.h>
-#undef UINT8
-#undef UINT16
-#undef boolean
 #endif
 
-
-
 #include "Game.h"
-extern "C" {
-#include "zlib.h"
-#include "png.h"
-#ifdef WIN32
-#define INT32 INT32_jpeg
-#include "jpeglib.h"
-#undef INT32
-#else
-#include "jpeglib.h"
-#endif
-}
+
+#include <jpeglib.h>
+#include <png.h>
+#include <zlib.h>
 
 using namespace Game;