svn commit: branches/busybox_scratch/libbb

[aldot at busybox.net]

Author: aldot
Date: 2006-08-20 03:46:04 -0700 (Sun, 20 Aug 2006)
New Revision: 15833

Log:
- xzalloc was incorrectly placed in #ifndef DMALLOC which led to compile-failures


Modified:
   branches/busybox_scratch/libbb/xfuncs.c


Changeset:
Modified: branches/busybox_scratch/libbb/xfuncs.c
===================================================================
--- branches/busybox_scratch/libbb/xfuncs.c	2006-08-20 10:44:35 UTC (rev 15832)
+++ branches/busybox_scratch/libbb/xfuncs.c	2006-08-20 10:46:04 UTC (rev 15833)
@@ -38,15 +38,6 @@
 }
 #endif
 
-#ifdef L_xzalloc
-void *xzalloc(size_t size)
-{
-	void *ptr = xmalloc(size);
-	memset(ptr, 0, size);
-	return ptr;
-}
-#endif
-
 #ifdef L_xcalloc
 void *xcalloc(size_t nmemb, size_t size)
 {
@@ -58,6 +49,15 @@
 #endif
 #endif /* DMALLOC */
 
+#ifdef L_xzalloc
+void *xzalloc(size_t size)
+{
+	void *ptr = xmalloc(size);
+	memset(ptr, 0, size);
+	return ptr;
+}
+#endif
+
 #ifdef L_xstrdup
 char * bb_xstrdup (const char *s)
 {