[Scummvm-cvs-logs] SF.net SVN: scummvm: [26034] scummvm/trunk
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Fri Mar 9 01:13:08 CET 2007
Revision: 26034
http://scummvm.svn.sourceforge.net/scummvm/?rev=26034&view=rev
Author: peres001
Date: 2007-03-08 16:13:07 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
reduced dependency from windows-specific header files
Modified Paths:
--------------
scummvm/trunk/backends/midi/windows.cpp
scummvm/trunk/backends/platform/sdl/sdl.cpp
scummvm/trunk/common/config-manager.cpp
scummvm/trunk/common/stdafx.h
scummvm/trunk/engines/engine.cpp
scummvm/trunk/engines/scumm/he/resource_he.h
Modified: scummvm/trunk/backends/midi/windows.cpp
===================================================================
--- scummvm/trunk/backends/midi/windows.cpp 2007-03-08 22:15:20 UTC (rev 26033)
+++ scummvm/trunk/backends/midi/windows.cpp 2007-03-09 00:13:07 UTC (rev 26034)
@@ -21,6 +21,9 @@
#if defined(WIN32) && !defined(_WIN32_WCE)
+
+#include <windows.h>
+#include <mmsystem.h>
#include "common/stdafx.h"
#include "sound/mpu401.h"
#include "common/util.h"
Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp 2007-03-08 22:15:20 UTC (rev 26033)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp 2007-03-09 00:13:07 UTC (rev 26034)
@@ -33,6 +33,10 @@
#include "icons/scummvm.xpm"
+#if defined(WIN32)
+#include <windows.h>
+#endif
+
#if defined(__SYMBIAN32__)
#include "SymbianOs.h"
#endif
Modified: scummvm/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp 2007-03-08 22:15:20 UTC (rev 26033)
+++ scummvm/trunk/common/config-manager.cpp 2007-03-09 00:13:07 UTC (rev 26034)
@@ -29,6 +29,10 @@
DECLARE_SINGLETON(Common::ConfigManager);
+#if defined(WIN32)
+#include <windows.h>
+#endif
+
#ifdef __PLAYSTATION2__
#include "backends/platform/ps2/systemps2.h"
#endif
Modified: scummvm/trunk/common/stdafx.h
===================================================================
--- scummvm/trunk/common/stdafx.h 2007-03-08 22:15:20 UTC (rev 26033)
+++ scummvm/trunk/common/stdafx.h 2007-03-09 00:13:07 UTC (rev 26034)
@@ -94,20 +94,11 @@
#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__)
Modified: scummvm/trunk/engines/engine.cpp
===================================================================
--- scummvm/trunk/engines/engine.cpp 2007-03-08 22:15:20 UTC (rev 26033)
+++ scummvm/trunk/engines/engine.cpp 2007-03-09 00:13:07 UTC (rev 26034)
@@ -29,6 +29,11 @@
#include "gui/message.h"
#include "sound/mixer.h"
+#if defined(WIN32)
+#include <windows.h>
+#include <direct.h>
+#endif
+
#ifdef _WIN32_WCE
extern bool isSmartphone(void);
#endif
Modified: scummvm/trunk/engines/scumm/he/resource_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/resource_he.h 2007-03-08 22:15:20 UTC (rev 26033)
+++ scummvm/trunk/engines/scumm/he/resource_he.h 2007-03-09 00:13:07 UTC (rev 26034)
@@ -56,11 +56,9 @@
#define IMAGE_DOS_SIGNATURE 0x5A4D /* MZ */
#define IMAGE_NT_SIGNATURE 0x00004550 /* PE00 */
-#if !defined (WIN32)
#define IMAGE_SCN_CNT_CODE 0x00000020
#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040
#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080
-#endif
// Only IMAGE_DIRECTORY_ENTRY_RESOURCE is used:
#define IMAGE_DIRECTORY_ENTRY_EXPORT 0
@@ -80,7 +78,6 @@
#define IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR 14
// Only RT_GROUP_CURSOR and RT_GROUP_ICON are used
-#if !defined (WIN32)
#define RT_CURSOR 1
#define RT_BITMAP 2
#define RT_ICON 3
@@ -94,7 +91,6 @@
#define RT_MESSAGELIST 11
#define RT_GROUP_CURSOR 12
#define RT_GROUP_ICON 14
-#endif
#define RETURN_IF_BAD_POINTER(r, x) \
if (!check_offset(fi->memory, fi->total_size, fi->file->name(), &(x), sizeof(x))) \
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