cleaned up stdafx.h, removing various unnecessary #includes (there are still some windows ones which look fishy, though)

svn-id: r26031

2 files changed, 100 insertions, 122 deletions

diff --git a/common/scummsys.h b/common/scummsys.h
index 25a9ae9d0a..3a697f7504 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -24,7 +24,7 @@
 #ifndef COMMON_SCUMMSYS_H
 #define COMMON_SCUMMSYS_H
 
-#if !defined(_STDAFX_H) && !defined(__PLAYSTATION2__)
+#if !defined(COMMON_STDAFX_H) && !defined(__PLAYSTATION2__)
 #error Included scummsys.h without including stdafx.h first!
 #endif
 
@@ -358,6 +358,10 @@
 #define PI 3.14159265358979323846
 #endif
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 256
+#endif
+
 
 //
 // Typedef our system types unless SCUMMVM_DONT_DEFINE_TYPES is set.
diff --git a/common/stdafx.h b/common/stdafx.h
index 38f2eaeb27..71b48e3136 100644
--- a/common/stdafx.h
+++ b/common/stdafx.h
@@ -21,134 +21,108 @@
  *
  */
 
-#ifndef _STDAFX_H
-#define _STDAFX_H
+#ifndef COMMON_STDAFX_H
+#define COMMON_STDAFX_H
 
 #if defined(_WIN32_WCE) && _WIN32_WCE < 300
-
-#define NONSTANDARD_PORT
-
+	#define NONSTANDARD_PORT
 #endif
 
 #if defined(NONSTANDARD_PORT)
 
-#include <portdefs.h>
-
-#elif defined(WIN32)
-
-#ifdef _MSC_VER
-#pragma once
-#pragma warning( disable : 4068 ) // turn off "unknown pragma" warning
-#pragma warning( disable : 4100 ) // turn off "unreferenced formal parameter" warning
-#pragma warning( disable : 4127 ) // turn off "conditional expression is constant" warning
-#pragma warning( disable : 4201 ) // turn off "nonstandard extension used : nameless struct/union" warning
-#pragma warning( disable : 4244 ) // turn off "conversion type" warning
-#pragma warning( disable : 4310 ) // turn off "cast truncates constant value" warning
-#pragma warning( disable : 4355 ) // turn off "base member init" warning
-#pragma warning( disable : 4390 ) // turn off "empty statement" warning for BS2 code
-#pragma warning( disable : 4250 ) // turn off "inherits via dominance" warning
-#pragma warning( disable : 4121 ) // turn off "alignment of a member was sensitive to packing" warning
-#pragma warning( disable : 4511 ) // turn off "copy constructor could not be generated" warning
-#pragma warning( disable : 4512 ) // turn off "assignment operator could not be generated" warning
-#pragma warning( disable : 4351 ) // turn off "new behavior ... will be default initialized" warning
-#pragma warning( disable : 4505 ) // turn off "unreferenced local function has been removed"
-#pragma warning( disable : 4510 ) // turn off "default constructor could not be generated"
-#pragma warning( disable : 4610 ) // turn off "struct can never be instantiated - user defined constructor required"
-
-// FIXME: 4702 & 4706 - may be enabled
-#pragma warning( disable : 4702 ) // turn off "unreachable code" warning
-#pragma warning( disable : 4706 ) // turn off "assignment within conditional expression" warning
-
-#define vsnprintf _vsnprintf
-#endif
-
-#if !defined(_WIN32_WCE)
-
-
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-#define NOGDICAPMASKS
-#define OEMRESOURCE
-#define NONLS
-#define NOICONS
-#define NOMCX
-#define NOPROFILER
-#define NOKANJI
-#define NOSERVICE
-#define NOMETAFILE
-#define NOCOMM
-#define NOCRYPT
-#define NOIME
-#define NOATOM
-#define NOCTLMGR
-#define NOCLIPBOARD
-#define NOMEMMGR
-#define NOSYSMETRICS
-#define NOMENUS
-#define NOOPENFILE
-#define NOWH
-#define NOSOUND
-#define NODRAWTEXT
-
-
-#endif
-
-
-#include <windows.h>
-#if defined(ARRAYSIZE)
-// VS2005beta2 introduces new stuff in winnt.h
-#undef ARRAYSIZE
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <io.h>
-#include <stdarg.h>
-#include <fcntl.h>
-#include <conio.h>
-#include <assert.h>
-#include <mmsystem.h>
-#include <ctype.h>
-#include <winuser.h>
-#include <direct.h>
-#include <time.h>
-#include <math.h>
-
-#else
-
-#if defined(__MORPHOS__)
-#include <devices/timer.h>
-#undef CMD_INVALID
-#endif
-#if !defined(macintosh) && !defined(PALMOS_ARM)
-#include <sys/types.h>
-#if !defined(__PLAYSTATION2__) && !defined(__PSP__) && !defined(__amigaos4__) && !defined(__SYMBIAN32__)
-#include <sys/uio.h>
-#endif
-#if !defined(__amigaos4__)
-#include <sys/param.h>
-#endif
-#endif
-#if !defined (__BEOS__)
-#include <unistd.h>
-#endif
-#if defined(__QNXNTO__)
-#include <strings.h>	/* For strcasecmp */
-#endif
-#include <stdio.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <ctype.h>
-#include <time.h>
-#include <math.h>
-
-
-#endif
+	// Ports which need to perform #includes and #defines visible in
+	// virtually all the source of ScummVM should do so by providing a
+	// "portdefs.h" header file (and not by directly modifying this
+	// header file).
+	#include <portdefs.h>
+
+#else // defined(NONSTANDARD_PORT)
+
+	#if defined(WIN32)
+	
+		#ifdef _MSC_VER
+		#pragma once
+		#pragma warning( disable : 4068 ) // turn off "unknown pragma" warning
+		#pragma warning( disable : 4100 ) // turn off "unreferenced formal parameter" warning
+		#pragma warning( disable : 4127 ) // turn off "conditional expression is constant" warning
+		#pragma warning( disable : 4201 ) // turn off "nonstandard extension used : nameless struct/union" warning
+		#pragma warning( disable : 4244 ) // turn off "conversion type" warning
+		#pragma warning( disable : 4310 ) // turn off "cast truncates constant value" warning
+		#pragma warning( disable : 4355 ) // turn off "base member init" warning
+		#pragma warning( disable : 4390 ) // turn off "empty statement" warning for BS2 code
+		#pragma warning( disable : 4250 ) // turn off "inherits via dominance" warning
+		#pragma warning( disable : 4121 ) // turn off "alignment of a member was sensitive to packing" warning
+		#pragma warning( disable : 4511 ) // turn off "copy constructor could not be generated" warning
+		#pragma warning( disable : 4512 ) // turn off "assignment operator could not be generated" warning
+		#pragma warning( disable : 4351 ) // turn off "new behavior ... will be default initialized" warning
+		#pragma warning( disable : 4505 ) // turn off "unreferenced local function has been removed"
+		#pragma warning( disable : 4510 ) // turn off "default constructor could not be generated"
+		#pragma warning( disable : 4610 ) // turn off "struct can never be instantiated - user defined constructor required"
+		
+		// FIXME: 4702 & 4706 - may be enabled
+		#pragma warning( disable : 4702 ) // turn off "unreachable code" warning
+		#pragma warning( disable : 4706 ) // turn off "assignment within conditional expression" warning
+		
+		#define vsnprintf _vsnprintf
+		#endif
+		
+		#if !defined(_WIN32_WCE)
+		
+		#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+		#define NOGDICAPMASKS
+		#define OEMRESOURCE
+		#define NONLS
+		#define NOICONS
+		#define NOMCX
+		#define NOPROFILER
+		#define NOKANJI
+		#define NOSERVICE
+		#define NOMETAFILE
+		#define NOCOMM
+		#define NOCRYPT
+		#define NOIME
+		#define NOATOM
+		#define NOCTLMGR
+		#define NOCLIPBOARD
+		#define NOMEMMGR
+		#define NOSYSMETRICS
+		#define NOMENUS
+		#define NOOPENFILE
+		#define NOWH
+		#define NOSOUND
+		#define NODRAWTEXT
+		
+		#endif
+		
+		
+		#include <windows.h>
+		#if defined(ARRAYSIZE)
+		// VS2005beta2 introduces new stuff in winnt.h
+		#undef ARRAYSIZE
+		#endif
+		
+		#include <io.h>
+		#include <fcntl.h>
+		#include <conio.h>
+		#include <mmsystem.h>
+		#include <winuser.h>
+		#include <direct.h>
+
+	#endif
+	
+	#if defined(__QNXNTO__)
+	#include <strings.h>	/* For strcasecmp */
+	#endif
+
+	#include <stdio.h>
+	#include <stdlib.h>
+	#include <string.h>
+	#include <stdarg.h>
+	#include <assert.h>
+	#include <ctype.h>
+	#include <time.h>
+	#include <math.h>
 
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 256
 #endif
 
 #endif