aboutsummaryrefslogtreecommitdiff
path: root/common/scummsys.h
diff options
context:
space:
mode:
authorMax Horn2006-04-02 00:08:22 +0000
committerMax Horn2006-04-02 00:08:22 +0000
commit587431f8e838bd08d081d65f18b1f9b8f04566b8 (patch)
treeb0d258b1c28ed19887de121773e723b966369e00 /common/scummsys.h
parenta2c4795f326e62fe8ff74ce0e29e0174d4dab330 (diff)
downloadscummvm-rg350-587431f8e838bd08d081d65f18b1f9b8f04566b8.tar.gz
scummvm-rg350-587431f8e838bd08d081d65f18b1f9b8f04566b8.tar.bz2
scummvm-rg350-587431f8e838bd08d081d65f18b1f9b8f04566b8.zip
Fully and officially renamed our main function to scummvm_main, thus making
various backend specific hacks unnecessary. As a consequence, it is now the responsibility of the backend to define main. Hence I adapted the SDL backend accordingly. svn-id: r21542
Diffstat (limited to 'common/scummsys.h')
-rw-r--r--common/scummsys.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/common/scummsys.h b/common/scummsys.h
index 05a9950c41..2f38eec992 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -20,6 +20,7 @@
* $Id$
*
*/
+
#ifndef COMMON_SCUMMSYS_H
#define COMMON_SCUMMSYS_H
@@ -200,8 +201,6 @@
#define END_PACK_STRUCTS pack ()
#endif
- #define main morphos_main
-
#elif defined(__DC__)
#define scumm_stricmp strcasecmp
@@ -386,7 +385,6 @@
#endif
-
//
// Overlay color type (FIXME: shouldn't be declared here)
//
@@ -398,4 +396,5 @@
typedef int16 OverlayColor;
#endif
+
#endif