- fixed development builds

        * khtml/misc/main_thread_malloc.h: Use inlines instead of macros for allocation functions.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9053 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8819fa9e583d78ad362604cac6ac0f0ca1be0d01..86d88cfefe5976d81cbfd64e0601ac428f4eb9f6 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2005-04-26  Darin Adler  <darin@apple.com>
+
+        - fixed development builds
+
+        * khtml/misc/main_thread_malloc.h: Use inlines instead of macros for allocation functions.
+
 2005-04-25  David Hyatt  <hyatt@apple.com>
 
        Fix for 4097842, changing 1st line of a url that wraps doesn't update the second line.  Make sure to

diff --git a/WebCore/khtml/misc/main_thread_malloc.h b/WebCore/khtml/misc/main_thread_malloc.h
index 97a50bad439c3c5fbacd5d1291778e7f8728a5c3..81bedb6a3f5921d352273888b01bd152122f74df 100644 (file)
--- a/WebCore/khtml/misc/main_thread_malloc.h
+++ b/WebCore/khtml/misc/main_thread_malloc.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef KHTMLMAINTTHREADMALLOC_H
 #define KHTMLMAINTTHREADMALLOC_H
 
@@ -30,31 +29,30 @@
 // while holding the collector lock (this is true whenenever the interpreter is
 // executing or GC is taking place).
 
+namespace khtml {
 
 #ifndef NDEBUG
 
-#define main_thread_malloc malloc
-#define main_thread_calloc calloc
-#define main_thread_free free
-#define main_thread_realloc realloc
+inline void *main_thread_malloc(size_t n) { return malloc(n); }
+inline void *main_thread_calloc(size_t n_elements, size_t element_size) { return calloc(n_elements, element_size); }
+inline void main_thread_free(void* p) { free(p); }
+inline void *main_thread_realloc(void* p, size_t n) { return realloc(p, n); }
 
 #define MAIN_THREAD_ALLOCATED
 
 #else
 
-namespace khtml {
-
 void *main_thread_malloc(size_t n);
 void *main_thread_calloc(size_t n_elements, size_t element_size);
 void main_thread_free(void* p);
 void *main_thread_realloc(void* p, size_t n);
 
-};
-
 #define MAIN_THREAD_ALLOCATED \
 void* operator new(size_t s) { return khtml::main_thread_malloc(s); } \
 void operator delete(void* p) { khtml::main_thread_free(p); }
 
 #endif
 
+};
+
 #endif /* KHTMLMAINTTHREADMALLOC_H */