Changeset 361 for ps

Timestamp:

06/02/04 18:33:59 (21 years ago)

Author:

janwas

Message:

fixed *nix libpng include fix

File:

• ps/trunk/source/lib/res/tex.cpp (modified) (1 diff)

ps/trunk/source/lib/res/tex.cpp

@@ -34 +34 @@
 #endif
 
-// libpng includes windows.h - prevent that, and define what it needs.
-#define _WINDOWS_
-#define WINAPI __stdcall
-#define WINAPIV __cdecl
 
 #ifndef NO_PNG
 # ifdef _WIN32
+#  define _WINDOWS_         // prevent libpng from including windows.h
+#  define WINAPI __stdcall  // .. and define what it needs
+#  define WINAPIV __cdecl
 #  include <libpng10/png.h>
-# else
-#  include <png.h>
 #  ifdef _MSC_VER
 #   pragma comment(lib, "libpng10.lib")
 #  endif
-# endif
-#endif
+# else  // _WIN32
+#  include <png.h>
+# endif // _WIN32
+#endif  // NO_PNG