X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscreen%2FGLBitmaps.cxx;h=05f61553df646d24eddf1ccbc395379aeef2f487;hb=84dd54b33a6d8b35e57c32194b025f79245f35c4;hp=eef3e7ad023d091fe5730676f7d7586f052983c6;hpb=689a942f193c1c15b4ddb4009958b7782cde44e7;p=simgear.git diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx index eef3e7ad..05f61553 100755 --- a/simgear/screen/GLBitmaps.cxx +++ b/simgear/screen/GLBitmaps.cxx @@ -1,17 +1,19 @@ #ifdef HAVE_CONFIG_H -# include +# include #endif -#ifdef HAVE_WINDOWS_H -# include +#if defined(__CYGWIN__) /* && !defined(USING_X) */ +#define WIN32 +#endif + +#if defined(WIN32) /* MINGW and MSC predefine WIN32 */ +# include #endif #include #include #include - -#include -#include +#include // memcpy() #include "GLBitmaps.h"