Merge

2011-03-12 14:12:14 +01:00 · 2011-03-12 14:12:14 +01:00 · 52c2227cef
parent 68c214dd98 fd2b981547
commit 52c2227cef
1 changed files with 1 additions and 5 deletions
--- a/src/lib/texture/C4Surface.cpp
+++ b/src/lib/texture/C4Surface.cpp
@ -294,11 +294,7 @@ extern "C"
 /* avoid conflict with conflicting boolean and FAR typedefs */
 #undef __RPCNDR_H__
 #undef FAR
-#ifdef jpeg_boolean
-    #define boolean jpeg_boolean
-#else
-    #define jpeg_boolean boolean
-#endif
+#define boolean jpeg_boolean
 #include <jpeglib.h>
 #undef boolean
 }