From fd2b981547606d4a6288bc0fcbd834dfd5ed4a36 Mon Sep 17 00:00:00 2001
From: Armin Burgmeier <armin@arbur.net>
Date: Sat, 12 Mar 2011 14:12:04 +0100
Subject: [PATCH] Backed out changeset: b019ea52537e

Breaks build with more recent jpeglib such as used by nightly builds
---
 src/lib/texture/C4Surface.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/lib/texture/C4Surface.cpp b/src/lib/texture/C4Surface.cpp
index 886979f0d..0586f4fea 100644
--- 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
 }