aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/scaler.cpp3
-rw-r--r--common/scaler.h3
-rw-r--r--common/system.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/common/scaler.cpp b/common/scaler.cpp
index 795c90d67a..ed96390962 100644
--- a/common/scaler.cpp
+++ b/common/scaler.cpp
@@ -51,7 +51,7 @@ void InitScalers(uint32 BitFormat) {
} else if (BitFormat == 555) {
dotmatrix = dotmatrix_555;
} else {
- error("Unknown bit format %d\n", BitFormat);
+ error("Unknown bit format %d", BitFormat);
}
gBitFormat = BitFormat;
@@ -291,4 +291,3 @@ void DotMatrix(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPi
q += nextlineDst << 1;
}
}
-
diff --git a/common/scaler.h b/common/scaler.h
index af7beafe67..fb427c6fac 100644
--- a/common/scaler.h
+++ b/common/scaler.h
@@ -21,6 +21,9 @@
#ifndef COMMON_SCALER_H
#define COMMON_SCALER_H
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+
extern void InitScalers(uint32 BitFormat);
typedef void ScalerProc(const uint8 *srcPtr, uint32 srcPitch,
diff --git a/common/system.cpp b/common/system.cpp
index 348273a4c8..bbede45b27 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -46,8 +46,6 @@ static OSystem *createSystem() {
return OSystem_MorphOS_create(gfx_mode, ConfMan.getBool("fullscreen"));
#elif defined(_WIN32_WCE)
return OSystem_WINCE3_create();
-#elif defined(MACOS_CARBON)
- return OSystem_MAC_create(gfx_mode, ConfMan.getBool("fullscreen"));
#elif defined(__GP32__) // ph0x
return OSystem_GP32_create(GFX_NORMAL, true);
#elif defined(__PALM_OS__) //chrilith