From 65dc53a585016139773dfcec01b8548665dc4dab Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 29 Jun 2007 19:09:45 +0000 Subject: [PATCH] oops, compile properly in O4 --- dtool/src/dtoolbase/dtoolbase_cc.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dtool/src/dtoolbase/dtoolbase_cc.h b/dtool/src/dtoolbase/dtoolbase_cc.h index db59395aa2..310ac86f23 100644 --- a/dtool/src/dtoolbase/dtoolbase_cc.h +++ b/dtool/src/dtoolbase/dtoolbase_cc.h @@ -158,11 +158,11 @@ EXPCL_DTOOL void init_memory_hook(); #define PANDA_REALLOC_ARRAY(ptr, size) (memory_hook->heap_realloc_array(ptr, size)) #define PANDA_FREE_ARRAY(ptr) memory_hook->heap_free_array(ptr) #else -#define PANDA_MALLOC_SINGLE(size) malloc(size) -#define PANDA_FREE_SINGLE(ptr) free(ptr) -#define PANDA_MALLOC_ARRAY(size) malloc(size) -#define PANDA_REALLOC_ARRAY(ptr, size) realloc(ptr, size) -#define PANDA_FREE_ARRAY(ptr) free(ptr) +#define PANDA_MALLOC_SINGLE(size) ::malloc(size) +#define PANDA_FREE_SINGLE(ptr) ::free(ptr) +#define PANDA_MALLOC_ARRAY(size) ::malloc(size) +#define PANDA_REALLOC_ARRAY(ptr, size) ::realloc(ptr, size) +#define PANDA_FREE_ARRAY(ptr) ::free(ptr) #endif // USE_MEMORY_NOWRAPPERS #if defined(HAVE_THREADS) && defined(SIMPLE_THREADS)