common/sys.h -> common/scummsys.h to minimalize diffs with scummvm

2011-04-17 01:00:10 +02:00 · 2011-04-17 01:00:10 +02:00 · 252d484434
commit 252d484434
parent c7c65eb83c
132 changed files with 135 additions and 135 deletions
--- a/audio/audiostream.h
+++ b/audio/audiostream.h
@ -27,7 +27,7 @@
 #define SOUND_AUDIOSTREAM_H

 #include "common/util.h"
-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/types.h"

 #include "audio/timestamp.h"
--- a/audio/decoders/flac.h
+++ b/audio/decoders/flac.h
@ -43,7 +43,7 @@
 #ifndef SOUND_FLAC_H
 #define SOUND_FLAC_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/types.h"

 #ifdef USE_FLAC
--- a/audio/decoders/mp3.h
+++ b/audio/decoders/mp3.h
@ -44,7 +44,7 @@
 #ifndef SOUND_MP3_H
 #define SOUND_MP3_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/types.h"

 #ifdef USE_MAD
--- a/audio/decoders/raw.h
+++ b/audio/decoders/raw.h
@ -26,7 +26,7 @@
 #ifndef SOUND_RAW_H
 #define SOUND_RAW_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/types.h"

 #include "common/list.h"
--- a/audio/decoders/vorbis.h
+++ b/audio/decoders/vorbis.h
@ -43,7 +43,7 @@
 #ifndef SOUND_VORBIS_H
 #define SOUND_VORBIS_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/types.h"

 #ifdef USE_VORBIS
--- a/audio/fmopl.h
+++ b/audio/fmopl.h
@ -25,7 +25,7 @@
 #ifndef SOUND_FMOPL_H
 #define SOUND_FMOPL_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/str.h"

 namespace OPL {
--- a/audio/mididrv.h
+++ b/audio/mididrv.h
@ -26,7 +26,7 @@
 #ifndef SOUND_MIDIDRV_H
 #define SOUND_MIDIDRV_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/timer.h"

 class MidiChannel;
--- a/audio/midiparser.h
+++ b/audio/midiparser.h
@ -28,7 +28,7 @@
 #ifndef SOUND_MIDIPARSER_H
 #define SOUND_MIDIPARSER_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/endian.h"

 class MidiParser;
--- a/audio/mixer_intern.h
+++ b/audio/mixer_intern.h
@ -26,7 +26,7 @@
 #ifndef SOUND_MIXER_INTERN_H
 #define SOUND_MIXER_INTERN_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/mutex.h"
 #include "audio/mixer.h"

--- a/audio/rate.h
+++ b/audio/rate.h
@ -26,7 +26,7 @@
 #ifndef SOUND_RATE_H
 #define SOUND_RATE_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "engines/engine.h"

 class AudioStream;
--- a/audio/softsynth/cms.h
+++ b/audio/softsynth/cms.h
@ -25,7 +25,7 @@
 #ifndef SOUND_SOFTSYNTH_CMS_H
 #define SOUND_SOFTSYNTH_CMS_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 /* this structure defines a channel */
 struct saa1099_channel {
--- a/audio/softsynth/fluidsynth.cpp
+++ b/audio/softsynth/fluidsynth.cpp
@ -22,7 +22,7 @@
 * $Id$
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef USE_FLUIDSYNTH

--- a/audio/softsynth/mt32.cpp
+++ b/audio/softsynth/mt32.cpp
@ -22,7 +22,7 @@
 * $Id$
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef USE_MT32EMU

--- a/audio/softsynth/mt32/mt32_file.h
+++ b/audio/softsynth/mt32/mt32_file.h
@ -22,7 +22,7 @@
 #ifndef MT32EMU_FILE_H
 #define MT32EMU_FILE_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 namespace MT32Emu {

--- a/audio/softsynth/mt32/synth.h
+++ b/audio/softsynth/mt32/synth.h
@ -22,7 +22,7 @@
 #ifndef MT32EMU_SYNTH_H
 #define MT32EMU_SYNTH_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 class revmodel;

--- a/audio/softsynth/opl/dbopl.h
+++ b/audio/softsynth/opl/dbopl.h
@ -21,7 +21,7 @@
 #ifndef SOUND_SOFTSYNTH_OPL_DBOPL_H
 #define SOUND_SOFTSYNTH_OPL_DBOPL_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifndef DISABLE_DOSBOX_OPL

--- a/audio/softsynth/opl/dosbox.cpp
+++ b/audio/softsynth/opl/dosbox.cpp
@ -35,7 +35,7 @@
 #include "dbopl.h"

 #include "common/system.h"
-#include "common/sys.h"
+#include "common/scummsys.h"

 #include <math.h>
 #include <string.h>
--- a/audio/softsynth/opl/mame.h
+++ b/audio/softsynth/opl/mame.h
@ -29,7 +29,7 @@
 #ifndef SOUND_SOFTSYNTH_OPL_MAME_H
 #define SOUND_SOFTSYNTH_OPL_MAME_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/util.h"
 #include "common/random.h"

--- a/audio/softsynth/ym2612.h
+++ b/audio/softsynth/ym2612.h
@ -25,7 +25,7 @@
 #ifndef SOUND_SOFTSYNTH_Y2612_H
 #define SOUND_SOFTSYNTH_Y2612_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 #include "audio/softsynth/emumidi.h"

--- a/audio/timestamp.h
+++ b/audio/timestamp.h
@ -26,7 +26,7 @@
 #ifndef SOUND_TIMESTAMP_H
 #define SOUND_TIMESTAMP_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 namespace Audio {

--- a/backends/audiocd/audiocd.h
+++ b/backends/audiocd/audiocd.h
@ -26,7 +26,7 @@
 #ifndef BACKENDS_AUDIOCD_ABSTRACT_H
 #define BACKENDS_AUDIOCD_ABSTRACT_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/noncopyable.h"

 /**
--- a/backends/audiocd/sdl/sdl-audiocd.cpp
+++ b/backends/audiocd/sdl/sdl-audiocd.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(SDL_BACKEND)

--- a/backends/events/default/default-events.cpp
+++ b/backends/events/default/default-events.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if !defined(DISABLE_DEFAULT_EVENTMANAGER)

--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(SDL_BACKEND)

--- a/backends/fs/stdiostream.h
+++ b/backends/fs/stdiostream.h
@ -26,7 +26,7 @@
 #ifndef BACKENDS_FS_STDIOSTREAM_H
 #define BACKENDS_FS_STDIOSTREAM_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/noncopyable.h"
 #include "common/stream.h"
 #include "common/str.h"
--- a/backends/graphics/sdl/sdl-graphics.cpp
+++ b/backends/graphics/sdl/sdl-graphics.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(SDL_BACKEND)

--- a/backends/keymapper/action.h
+++ b/backends/keymapper/action.h
@ -26,7 +26,7 @@
 #ifndef COMMON_ACTION_H
 #define COMMON_ACTION_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef ENABLE_KEYMAPPER

--- a/backends/keymapper/hardware-key.h
+++ b/backends/keymapper/hardware-key.h
@ -26,7 +26,7 @@
 #ifndef COMMON_HARDWARE_KEY_H
 #define COMMON_HARDWARE_KEY_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef ENABLE_KEYMAPPER

--- a/backends/keymapper/keymap.h
+++ b/backends/keymapper/keymap.h
@ -26,7 +26,7 @@
 #ifndef COMMON_KEYMAP_H
 #define COMMON_KEYMAP_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef ENABLE_KEYMAPPER

--- a/backends/keymapper/keymapper.h
+++ b/backends/keymapper/keymapper.h
@ -26,7 +26,7 @@
 #ifndef COMMON_KEYMAPPER_H
 #define COMMON_KEYMAPPER_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef ENABLE_KEYMAPPER

--- a/backends/keymapper/remap-dialog.h
+++ b/backends/keymapper/remap-dialog.h
@ -25,7 +25,7 @@
 #ifndef REMAP_DIALOG_H
 #define REMAP_DIALOG_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef ENABLE_KEYMAPPER

--- a/backends/keymapper/types.h
+++ b/backends/keymapper/types.h
@ -26,7 +26,7 @@
 #ifndef KEYMAPPER_TYPES_H
 #define KEYMAPPER_TYPES_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef ENABLE_KEYMAPPER

--- a/backends/log/log.h
+++ b/backends/log/log.h
@ -26,7 +26,7 @@
 #ifndef BACKENDS_LOG_LOG_H
 #define BACKENDS_LOG_LOG_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 class OSystem;

--- a/backends/midi/alsa.cpp
+++ b/backends/midi/alsa.cpp
@ -25,7 +25,7 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(USE_ALSA)

--- a/backends/midi/camd.cpp
+++ b/backends/midi/camd.cpp
@ -25,7 +25,7 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(__amigaos4__)

--- a/backends/midi/coreaudio.cpp
+++ b/backends/midi/coreaudio.cpp
@ -25,7 +25,7 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef MACOSX

--- a/backends/midi/coremidi.cpp
+++ b/backends/midi/coremidi.cpp
@ -25,7 +25,7 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef MACOSX

--- a/backends/midi/dmedia.cpp
+++ b/backends/midi/dmedia.cpp
@ -19,7 +19,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 *
 * $URL$
- * $Id: dmedia.cpp$
+ * $Id$
 */

 /*
@ -30,11 +30,11 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(IRIX)

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/util.h"
 #include "common/config-manager.h"
 #include "audio/musicplugin.h"
--- a/backends/midi/seq.cpp
+++ b/backends/midi/seq.cpp
@ -31,7 +31,7 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(USE_SEQ_MIDI)

--- a/backends/midi/stmidi.cpp
+++ b/backends/midi/stmidi.cpp
@ -37,7 +37,7 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined __MINT__

--- a/backends/midi/timidity.cpp
+++ b/backends/midi/timidity.cpp
@ -37,7 +37,7 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(USE_TIMIDITY)

--- a/backends/midi/windows.cpp
+++ b/backends/midi/windows.cpp
@ -25,7 +25,7 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(WIN32) && !defined(_WIN32_WCE)

--- a/backends/mutex/sdl/sdl-mutex.cpp
+++ b/backends/mutex/sdl/sdl-mutex.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(SDL_BACKEND)

--- a/backends/platform/sdl/amigaos/amigaos-main.cpp
+++ b/backends/platform/sdl/amigaos/amigaos-main.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(__amigaos4__)

--- a/backends/platform/sdl/amigaos/amigaos.cpp
+++ b/backends/platform/sdl/amigaos/amigaos.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef __amigaos4__

--- a/backends/platform/sdl/macosx/macosx-main.cpp
+++ b/backends/platform/sdl/macosx/macosx-main.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef MACOSX

--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@ -26,7 +26,7 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef MACOSX

--- a/backends/platform/sdl/main.cpp
+++ b/backends/platform/sdl/main.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 // Several SDL based ports use a custom main, and hence do not want to compile
 // of this file. The following "#if" ensures that.
--- a/backends/platform/sdl/sdl-sys.h
+++ b/backends/platform/sdl/sdl-sys.h
@ -32,7 +32,7 @@
 // a FILE pointer in one place, which conflicts with common/forbidden.h.


-#include "common/sys.h"
+#include "common/scummsys.h"

 // Remove FILE override from common/forbidden.h, and replace
 // it with an alternate slightly less unfriendly override.
--- a/backends/platform/sdl/win32/win32-main.cpp
+++ b/backends/platform/sdl/win32/win32-main.cpp
@ -26,7 +26,7 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef WIN32

--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@ -26,7 +26,7 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef WIN32

--- a/backends/plugins/posix/posix-provider.cpp
+++ b/backends/plugins/posix/posix-provider.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(DYNAMIC_MODULES) && defined(UNIX)

--- a/backends/plugins/win32/win32-provider.cpp
+++ b/backends/plugins/win32/win32-provider.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(DYNAMIC_MODULES) && defined(_WIN32)

--- a/backends/saves/default/default-saves.cpp
+++ b/backends/saves/default/default-saves.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)

--- a/backends/saves/default/default-saves.h
+++ b/backends/saves/default/default-saves.h
@ -26,7 +26,7 @@
 #if !defined(BACKEND_SAVES_DEFAULT_H) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)
 #define BACKEND_SAVES_DEFAULT_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/savefile.h"
 #include "common/str.h"
 #include "common/fs.h"
--- a/backends/saves/posix/posix-saves.cpp
+++ b/backends/saves/posix/posix-saves.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(UNIX) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)

--- a/backends/timer/default/default-timer.cpp
+++ b/backends/timer/default/default-timer.cpp
@ -22,7 +22,7 @@
 * $Id$
 */

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "backends/timer/default/default-timer.h"
 #include "common/util.h"
 #include "common/system.h"
--- a/backends/timer/sdl/sdl-timer.cpp
+++ b/backends/timer/sdl/sdl-timer.cpp
@ -24,7 +24,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(SDL_BACKEND)

--- a/backends/vkeybd/image-map.cpp
+++ b/backends/vkeybd/image-map.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef ENABLE_VKEYBD

--- a/backends/vkeybd/image-map.h
+++ b/backends/vkeybd/image-map.h
@ -28,7 +28,7 @@

 #ifdef ENABLE_VKEYBD

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"

--- a/backends/vkeybd/polygon.cpp
+++ b/backends/vkeybd/polygon.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef ENABLE_VKEYBD

--- a/backends/vkeybd/polygon.h
+++ b/backends/vkeybd/polygon.h
@ -28,7 +28,7 @@

 #ifdef ENABLE_VKEYBD

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/array.h"
 #include "common/rect.h"

--- a/backends/vkeybd/virtual-keyboard-gui.cpp
+++ b/backends/vkeybd/virtual-keyboard-gui.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef ENABLE_VKEYBD

--- a/backends/vkeybd/virtual-keyboard-gui.h
+++ b/backends/vkeybd/virtual-keyboard-gui.h
@ -29,7 +29,7 @@
 #ifdef ENABLE_VKEYBD

 #include "backends/vkeybd/virtual-keyboard.h"
-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/rect.h"
 #include "common/system.h"
 #include "graphics/font.h"
--- a/backends/vkeybd/virtual-keyboard-parser.cpp
+++ b/backends/vkeybd/virtual-keyboard-parser.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef ENABLE_VKEYBD

--- a/backends/vkeybd/virtual-keyboard-parser.h
+++ b/backends/vkeybd/virtual-keyboard-parser.h
@ -28,7 +28,7 @@

 #ifdef ENABLE_VKEYBD

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/xmlparser.h"
 #include "backends/vkeybd/virtual-keyboard.h"

--- a/backends/vkeybd/virtual-keyboard.cpp
+++ b/backends/vkeybd/virtual-keyboard.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef ENABLE_VKEYBD

--- a/backends/vkeybd/virtual-keyboard.h
+++ b/backends/vkeybd/virtual-keyboard.h
@ -30,7 +30,7 @@

 class OSystem;

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/events.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"
--- a/base/main.h
+++ b/base/main.h
@ -26,7 +26,7 @@
 #ifndef BASE_MAIN_H
 #define BASE_MAIN_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 //
 // The residual main entry point, to be invoked by ports
--- a/base/version.cpp
+++ b/base/version.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "base/version.h"

 #define INCLUDED_FROM_BASE_VERSION_CPP
--- a/common/EventRecorder.h
+++ b/common/EventRecorder.h
@ -26,7 +26,7 @@
 #ifndef COMMON_EVENTRECORDER_H
 #define COMMON_EVENTRECORDER_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/events.h"
 #include "common/singleton.h"
 #include "common/mutex.h"
--- a/common/algorithm.h
+++ b/common/algorithm.h
@ -25,7 +25,7 @@
 #ifndef COMMON_ALGORITHM_H
 #define COMMON_ALGORITHM_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/func.h"
 #include "common/util.h"

--- a/common/array.h
+++ b/common/array.h
@ -25,7 +25,7 @@
 #ifndef COMMON_ARRAY_H
 #define COMMON_ARRAY_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/algorithm.h"

 namespace Common {
--- a/common/debug-channels.h
+++ b/common/debug-channels.h
@ -25,7 +25,7 @@
 #ifndef COMMON_DEBUG_CHANNELS_H
 #define COMMON_DEBUG_CHANNELS_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 #include "common/hashmap.h"
 #include "common/hash-str.h"
--- a/common/debug.h
+++ b/common/debug.h
@ -25,7 +25,7 @@
 #ifndef COMMON_DEBUG_H
 #define COMMON_DEBUG_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef DISABLE_TEXT_CONSOLE

--- a/common/endian.h
+++ b/common/endian.h
@ -26,7 +26,7 @@
 #ifndef COMMON_ENDIAN_H
 #define COMMON_ENDIAN_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 /**
 *  \file endian.h
--- a/common/file.h
+++ b/common/file.h
@ -26,7 +26,7 @@
 #ifndef COMMON_FILE_H
 #define COMMON_FILE_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/noncopyable.h"
 #include "common/str.h"
 #include "common/stream.h"
--- a/common/frac.h
+++ b/common/frac.h
@ -26,7 +26,7 @@
 #ifndef COMMON_FRAC_H
 #define COMMON_FRAC_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 /**
 * The precision of the fractional (fixed point) type we define below.
--- a/common/func.h
+++ b/common/func.h
@ -25,7 +25,7 @@
 #ifndef COMMON_FUNC_H
 #define COMMON_FUNC_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 namespace Common {

--- a/common/keyboard.h
+++ b/common/keyboard.h
@ -26,7 +26,7 @@
 #ifndef COMMON_KEYBOARD_H
 #define COMMON_KEYBOARD_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 #if defined(__amigaos4__)
 // KEYCODE_LESS and KEYCODE_GREATER are already defined in AmigaOS, inside
--- a/common/list_intern.h
+++ b/common/list_intern.h
@ -25,7 +25,7 @@
 #ifndef COMMON_LIST_INTERN_H
 #define COMMON_LIST_INTERN_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 namespace Common {

--- a/common/macresman.cpp
+++ b/common/macresman.cpp
@ -23,7 +23,7 @@
 *
 */

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/debug.h"
 #include "common/util.h"
 #include "common/file.h"
--- a/common/md5.h
+++ b/common/md5.h
@ -25,7 +25,7 @@
 #ifndef COMMON_MD5_H
 #define COMMON_MD5_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/str.h"

 namespace Common {
--- a/common/memorypool.h
+++ b/common/memorypool.h
@ -26,7 +26,7 @@
 #ifndef COMMON_MEMORYPOOL_H
 #define COMMON_MEMORYPOOL_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/array.h"


--- a/common/mutex.h
+++ b/common/mutex.h
@ -26,7 +26,7 @@
 #ifndef COMMON_MUTEX_H
 #define COMMON_MUTEX_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/system.h"

 namespace Common {
--- a/common/ptr.h
+++ b/common/ptr.h
@ -25,7 +25,7 @@
 #ifndef COMMON_PTR_H
 #define COMMON_PTR_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/noncopyable.h"

 namespace Common {
--- a/common/queue.h
+++ b/common/queue.h
@ -25,7 +25,7 @@
 #ifndef COMMON_QUEUE_H
 #define COMMON_QUEUE_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/list.h"

 namespace Common {
--- a/common/random.h
+++ b/common/random.h
@ -25,7 +25,7 @@
 #ifndef COMMON_RANDOM_H
 #define COMMON_RANDOM_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 namespace Common {

--- a/common/rational.h
+++ b/common/rational.h
@ -25,7 +25,7 @@
 #ifndef COMMON_RATIONAL_H
 #define COMMON_RATIONAL_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/frac.h"

 namespace Common {
--- a/common/rect.h
+++ b/common/rect.h
@ -26,7 +26,7 @@
 #ifndef COMMON_RECT_H
 #define COMMON_RECT_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/util.h"
 #include "common/debug.h"

--- a/common/savefile.h
+++ b/common/savefile.h
@ -27,7 +27,7 @@
 #define COMMON_SAVEFILE_H

 #include "common/noncopyable.h"
-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/stream.h"
 #include "common/str-array.h"
 #include "common/error.h"
--- a/common/scummsys.h
+++ b/common/scummsys.h
@ -23,8 +23,8 @@
 *
 */

-#ifndef COMMON_SYS_H
-#define COMMON_SYS_H
+#ifndef COMMON_SCUMMSYS_H
+#define COMMON_SCUMMSYS_H


 #if defined(_WIN32_WCE) && _WIN32_WCE < 300
--- a/common/stack.h
+++ b/common/stack.h
@ -25,7 +25,7 @@
 #ifndef COMMON_STACK_H
 #define COMMON_STACK_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/array.h"

 namespace Common {
--- a/common/str.h
+++ b/common/str.h
@ -25,7 +25,7 @@
 #ifndef COMMON_STRING_H
 #define COMMON_STRING_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 namespace Common {

--- a/common/system.h
+++ b/common/system.h
@ -26,7 +26,7 @@
 #ifndef COMMON_SYSTEM_H
 #define COMMON_SYSTEM_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/noncopyable.h"
 #include "common/rect.h"
 #include "common/list.h" // For OSystem::getSupportedFormats()
--- a/common/textconsole.h
+++ b/common/textconsole.h
@ -25,7 +25,7 @@
 #ifndef COMMON_CONSOLE_H
 #define COMMON_CONSOLE_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 namespace Common {

--- a/common/timer.h
+++ b/common/timer.h
@ -25,7 +25,7 @@
 #ifndef COMMON_TIMER_H
 #define COMMON_TIMER_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/noncopyable.h"

 namespace Common {
--- a/common/tokenizer.h
+++ b/common/tokenizer.h
@ -25,7 +25,7 @@
 #ifndef COMMON_TOKENIZER_H
 #define COMMON_TOKENIZER_H

-#include "common/sys.h"
+#include "common/scummsys.h"
 #include "common/str.h"

 namespace Common {
--- a/common/types.h
+++ b/common/types.h
@ -25,7 +25,7 @@
 #ifndef COMMON_TYPES_H
 #define COMMON_TYPES_H

-#include "common/sys.h"
+#include "common/scummsys.h"

 namespace DisposeAfterUse {
 	enum Flag { NO, YES };
--- a/common/unzip.cpp
+++ b/common/unzip.cpp
@ -69,7 +69,7 @@
      ftp://ftp.pkware.com/probdesc.zip */


-#include "common/sys.h"
+#include "common/scummsys.h"

 #ifdef USE_ZLIB

--- a/Show more
+++ b/Show more