[Scummvm-cvs-logs] SF.net SVN: scummvm:[38644] scummvm/trunk/engines/sci/scicore/tools.cpp

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Sat Feb 21 00:23:58 CET 2009


Revision: 38644
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38644&view=rev
Author:   aquadran
Date:     2009-02-20 23:23:58 +0000 (Fri, 20 Feb 2009)

Log Message:
-----------
fixed warning

Modified Paths:
--------------
    scummvm/trunk/engines/sci/scicore/tools.cpp

Modified: scummvm/trunk/engines/sci/scicore/tools.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/tools.cpp	2009-02-20 23:20:47 UTC (rev 38643)
+++ scummvm/trunk/engines/sci/scicore/tools.cpp	2009-02-20 23:23:58 UTC (rev 38644)
@@ -23,19 +23,18 @@
  *
  */
 
-
-#include "common/archive.h"
-#include "common/file.h"
-#include "common/util.h"
-
-
 #ifdef _MSC_VER
 #  include <sys/timeb.h>
 #  include <windows.h>
 #  include <sys/types.h>
 #  include <sys/stat.h>
+#  undef ARRAYSIZE
 #endif
 
+#include "common/archive.h"
+#include "common/file.h"
+#include "common/util.h"
+
 #ifdef WIN32
 #  include <windows.h>
 #  include <errno.h>
@@ -61,6 +60,7 @@
 
 #include "common/scummsys.h"
 #include "common/str.h"
+#  undef ARRAYSIZE
 
 #ifdef UNIX
 #define _GNU_SOURCE /* For FNM_CASEFOLD in fnmatch.h */


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




More information about the Scummvm-git-logs mailing list