[Scummvm-cvs-logs] SF.net SVN: scummvm:[38444] scummvm/trunk/engines/sci

[aquadran at users.sourceforge.net]

Revision: 38444
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38444&view=rev
Author:   aquadran
Date:     2009-02-17 20:26:57 +0000 (Tue, 17 Feb 2009)

Log Message:
-----------
shat up ARRAYSIZE redefine compiler warnings

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel.cpp
    scummvm/trunk/engines/sci/engine/kfile.cpp
    scummvm/trunk/engines/sci/engine/scriptdebug.cpp
    scummvm/trunk/engines/sci/scicore/tools.cpp

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2009-02-17 20:06:17 UTC (rev 38443)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2009-02-17 20:26:57 UTC (rev 38444)
@@ -23,14 +23,15 @@
  *
  */
 
-#include "sci/engine/gc.h"
-#include "sci/include/sciresource.h"
-#include "sci/include/engine.h"
 #ifdef WIN32
 #	include <windows.h>
 #	include <mmsystem.h>
+#	undef ARRAYSIZE
 #endif
 
+#include "sci/engine/gc.h"
+#include "sci/include/sciresource.h"
+#include "sci/include/engine.h"
 #include "sci/include/gfx_operations.h"
 #include "sci/engine/kernel_types.h"
 

Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp	2009-02-17 20:06:17 UTC (rev 38443)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp	2009-02-17 20:26:57 UTC (rev 38444)
@@ -23,21 +23,18 @@
  *
  */
 
-#include "common/str.h"
-
-#include "sci/include/engine.h"
-
-#include <errno.h>
-
 #ifdef WIN32
-#  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
-#  include <sys/types.h>
-#  include <sys/stat.h>
 #elif defined (__DC__)
 #  include <dc.h>
 #endif
 
+#include "common/str.h"
+
+#include "sci/include/engine.h"
+
+#include <errno.h>
+
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif

Modified: scummvm/trunk/engines/sci/engine/scriptdebug.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2009-02-17 20:06:17 UTC (rev 38443)
+++ scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2009-02-17 20:26:57 UTC (rev 38444)
@@ -25,22 +25,9 @@
 
 /* Script debugger functionality. Absolutely not threadsafe. */
 
-#include "sci/engine/gc.h"
-#include "sci/include/sciresource.h"
-#include "sci/include/engine.h"
-#include "sci/include/console.h"
-#include "sci/include/kdebug.h"
-#include "sci/include/vocabulary.h"
-#include "sci/engine/kernel_types.h"
-#include "sci/include/sci_midi.h"
-#include "sci/include/sci_widgets.h"
-
-#include "common/util.h"
-
 #ifdef WIN32
 #	include <windows.h>
 #	include <mmsystem.h>
-#	include <io.h>
 #	ifdef sleep
 #		undef sleep
 #	endif
@@ -59,6 +46,18 @@
 	} while (0);
 #endif
 
+#include "sci/engine/gc.h"
+#include "sci/include/sciresource.h"
+#include "sci/include/engine.h"
+#include "sci/include/console.h"
+#include "sci/include/kdebug.h"
+#include "sci/include/vocabulary.h"
+#include "sci/engine/kernel_types.h"
+#include "sci/include/sci_midi.h"
+#include "sci/include/sci_widgets.h"
+
+#include "common/util.h"
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 /* Assume this is a sufficient precondition */

Modified: scummvm/trunk/engines/sci/scicore/tools.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/tools.cpp	2009-02-17 20:06:17 UTC (rev 38443)
+++ scummvm/trunk/engines/sci/scicore/tools.cpp	2009-02-17 20:26:57 UTC (rev 38444)
@@ -24,19 +24,6 @@
  */
 
 
-#include "common/scummsys.h"
-#include "common/str.h"
-
-#ifdef UNIX
-#define _GNU_SOURCE /* For FNM_CASEFOLD in fnmatch.h */
-#include <fnmatch.h>
-#endif
-
-#include "sci/include/engine.h"
-
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-#endif
 #ifdef _MSC_VER
 #  include <sys/timeb.h>
 #  include <windows.h>
@@ -49,8 +36,6 @@
 #  include <errno.h>
 #  include <mmsystem.h>
 
-void usleep(long usec);
-
 #	ifdef sleep
 #		undef sleep
 #	endif
@@ -69,6 +54,20 @@
 	} while (0);
 #endif
 
+#include "common/scummsys.h"
+#include "common/str.h"
+
+#ifdef UNIX
+#define _GNU_SOURCE /* For FNM_CASEFOLD in fnmatch.h */
+#include <fnmatch.h>
+#endif
+
+#include "sci/include/engine.h"
+
+#ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+#endif
+
 #ifdef __DC__
 #  include <kos/thread.h>
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.