* merge from malloc.c

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_8_0@1887 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/src/malloc.c b/src/malloc.c
deleted file mode 100644 (file)
index c038441..0000000
--- a/src/malloc.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#undef malloc
-
-#include <sys/types.h>
-
-void *malloc ();
-
-void *rpl_malloc(size_t n) { if (n == 0) n = 1; return malloc (n); }

diff --git a/src/qs_malloc.c b/src/qs_malloc.c
index 84c877d..2c4f7b1 100644 (file)
--- a/src/qs_malloc.c
+++ b/src/qs_malloc.c
@@ -56,7 +56,13 @@ qs_all_free(Doc* doc, const char* UNUSED(fname), int UNUSED(line))
 
 
 #if HAVE_MALLOC == 0
-#include "malloc.c"
+#undef malloc
+
+#include <sys/types.h>
+
+void *malloc ();
+
+void *rpl_malloc(size_t n) { if (n == 0) n = 1; return malloc (n); }
 #endif
 /*
  * vim:ts=2 et