added __cdecl to memory definition, should allow compilation of code with non-cdecl default calling convention

This commit is contained in:
ejcoumans committed 2006-09-07 22:59:57 +00:00
1 parent 4365199a47
commit b8961f0308
1 file changed
+6 -4
+6 -4
View File
@@ -20,11 +20,13 @@
#ifdef WIN32 #ifdef WIN32
//added __cdecl, thanks Jack
// default new and delete overrides that guarantee 16 byte alignment and zero allocated memory // default new and delete overrides that guarantee 16 byte alignment and zero allocated memory
void* operator new(size_t sz) throw(); void* __cdecl operator new(size_t sz) throw();
void* operator new[](size_t sz) throw(); void* __cdecl operator new[](size_t sz) throw();
void operator delete(void* m) throw(); void __cdecl operator delete(void* m) throw();
void operator delete[](void* m) throw(); void __cdecl operator delete[](void* m) throw();
#include <malloc.h> #include <malloc.h>