X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscreen%2FGLBitmaps.cxx;h=30b6e12b1eabde076492c29e2b8c5f935233ba85;hb=bbd61977f14c30ce93a2bcf5a3551708d36a29c8;hp=a490a4d0bdc3ff4262bee9b079c1093e98406d5b;hpb=8d73160a75aa03509d448f83aa929079a5e31929;p=simgear.git diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx index a490a4d0..30b6e12b 100755 --- a/simgear/screen/GLBitmaps.cxx +++ b/simgear/screen/GLBitmaps.cxx @@ -2,11 +2,7 @@ # include #endif -#if defined(__CYGWIN__) /* && !defined(USING_X) */ -#define WIN32 -#endif - -#if defined(WIN32) /* MINGW and MSC predefine WIN32 */ +#ifdef WIN32 # include #endif @@ -15,10 +11,6 @@ #include #include // memcpy() -#include - -#include SG_GL_H - #include "GLBitmaps.h" GlBitmap::GlBitmap( GLenum mode, GLint width, GLint height, GLubyte *bitmap )