From: Wayne Davison <wayned@samba.org>
Date: Thu, 21 Aug 2003 23:32:35 +0000 (+0000)
Subject: Let's try only including malloc.h if stdlib.h isn't around (and it
X-Git-Tag: v2.5.7~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38b02c13d0173fc4a1ee67d67ceefc7107eefdc0;p=thirdparty%2Frsync.git

Let's try only including malloc.h if stdlib.h isn't around (and it
exists).
---

diff --git a/rsync.h b/rsync.h
index 52b3e70e..47943f30 100644
--- a/rsync.h
+++ b/rsync.h
@@ -122,6 +122,10 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#else
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
 #endif
 
 #ifdef HAVE_SYS_SOCKET_H
@@ -132,10 +136,6 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
 #include <string.h>
 #endif
 
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>