From a6725902594145cb0d1ecf3b3da764c92d1542db Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Sun, 7 Mar 2004 03:28:01 +0000
Subject: [PATCH] remove dependency on SDL_byteorder.h when we are using
 config.h

svn-id: r13206
---
 common/scummsys.h | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/common/scummsys.h b/common/scummsys.h
index 7eb1fb639be..383dbd9e493 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -106,22 +106,24 @@
 
 	#define CHECK_HEAP
 
-	#ifdef X11_BACKEND
-
-	// You need to set this manually if necessary
-//	#define SCUMM_LITTLE_ENDIAN
+	#ifndef CONFIG_H
+		#ifdef X11_BACKEND
 	
-	#else
-	/* need this for the SDL_BYTEORDER define */
-	#include <SDL_byteorder.h>
-
-	#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-	#define SCUMM_LITTLE_ENDIAN
-	#elif SDL_BYTEORDER == SDL_BIG_ENDIAN
-	#define SCUMM_BIG_ENDIAN
-	#else
-	#error Neither SDL_BIG_ENDIAN nor SDL_LITTLE_ENDIAN is set.
-	#endif
+		// You need to set this manually if necessary
+	//	#define SCUMM_LITTLE_ENDIAN
+		
+		#else
+		/* need this for the SDL_BYTEORDER define */
+		#include <SDL_byteorder.h>
+	
+		#if SDL_BYTEORDER == SDL_LIL_ENDIAN
+		#define SCUMM_LITTLE_ENDIAN
+		#elif SDL_BYTEORDER == SDL_BIG_ENDIAN
+		#define SCUMM_BIG_ENDIAN
+		#else
+		#error Neither SDL_BIG_ENDIAN nor SDL_LITTLE_ENDIAN is set.
+		#endif
+		#endif
 	#endif
 
 	// You need to set this manually if necessary