aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/scummsys.h4
-rw-r--r--scumm/scummvm.cpp3
2 files changed, 4 insertions, 3 deletions
diff --git a/common/scummsys.h b/common/scummsys.h
index a8e06f9cf0..064e9212d1 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -88,11 +88,11 @@ const bool true(1), false(0);
typedef unsigned char byte;
typedef unsigned char uint8;
typedef unsigned short uint16;
- typedef unsigned long uint32;
+ typedef unsigned int uint32;
typedef unsigned int uint;
typedef signed char int8;
typedef signed short int16;
- typedef signed long int32;
+ typedef signed int int32;
#define START_PACK_STRUCTS pack (push,1)
#define END_PACK_STRUCTS pack(pop)
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 447733d89f..c8164bd018 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -30,12 +30,13 @@
#include "actor.h"
#include "debug.h"
#include "dialogs.h"
-#include "gameDetector.h"
#include "gui/newgui.h"
#include "gui/message.h"
#include "object.h"
#include "resource.h"
#include "string.h"
+#include "verbs.h"
+#include "common/gameDetector.h"
#include "common/config-file.h"
#ifdef _WIN32_WCE