summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2003-08-21 23:32:35 +0000
committerWayne Davison <wayned@samba.org>2003-08-21 23:32:35 +0000
commit38b02c13d0173fc4a1ee67d67ceefc7107eefdc0 (patch)
treede917765fdac009475a79f5a9827e3d138b5a9f4
parentb017ec4e1342e9149384fecc44747d96b03f60cd (diff)
downloadrsync-38b02c13d0173fc4a1ee67d67ceefc7107eefdc0.tar.gz
Let's try only including malloc.h if stdlib.h isn't around (and it
exists).
-rw-r--r--rsync.h8
1 files changed, 4 insertions, 4 deletions
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>