aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMax Horn2003-09-18 18:22:15 +0000
committerMax Horn2003-09-18 18:22:15 +0000
commit209413ed07e931277cf569d260fbfad71406088e (patch)
treeba13e66babf87dd172366826d292754ba9f5417d /base
parentf8997ba7cc7cdc59a5f04f13fbabdd0d0114a42c (diff)
downloadscummvm-rg350-209413ed07e931277cf569d260fbfad71406088e.tar.gz
scummvm-rg350-209413ed07e931277cf569d260fbfad71406088e.tar.bz2
scummvm-rg350-209413ed07e931277cf569d260fbfad71406088e.zip
disable the custom operator 'new' on Mac OS X, as it cause multiple definition linker error when building ScummVM with loadable modules
svn-id: r10303
Diffstat (limited to 'base')
-rw-r--r--base/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/main.cpp b/base/main.cpp
index 8bcbafc97c..247fcb9f9d 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -290,7 +290,7 @@ int main(int argc, char *argv[]) {
return 0;
}
-#ifndef __PALM_OS__
+#if !defined(__PALM_OS__) && !defined(MACOSX)
void *operator new(size_t size) {
return memset(malloc(size), 0xE7, size);
}