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

exists).

Let's try only including malloc.h if stdlib.h isn't around (and it
exists).
38b02c13 · Wayne Davison · b017ec4e · 38b02c13
Commit 38b02c13 authored Aug 21, 2003 by Wayne Davison
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

rsync.h rsync.h +4 -4

No files found.
--- 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>