[Scummvm-cvs-logs] CVS: scummvm/base main.cpp,1.2,1.3

Max Horn fingolfin at users.sourceforge.net
Thu Sep 18 11:23:14 CEST 2003


Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv26798/base

Modified Files:
	main.cpp 
Log Message:
disable the custom operator 'new' on Mac OS X, as it cause multiple definition linker error when building ScummVM with loadable modules

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- main.cpp	18 Sep 2003 02:07:16 -0000	1.2
+++ main.cpp	18 Sep 2003 18:22:15 -0000	1.3
@@ -290,7 +290,7 @@
 	return 0;
 }
 
-#ifndef __PALM_OS__
+#if !defined(__PALM_OS__) && !defined(MACOSX)
 void *operator new(size_t size) {
 	return memset(malloc(size), 0xE7, size);
 }





More information about the Scummvm-git-logs mailing list