Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
b017ec4
)
Let's try only including malloc.h if stdlib.h isn't around (and it
author
Wayne Davison
<wayned@samba.org>
Thu, 21 Aug 2003 23:32:35 +0000
(23:32 +0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 21 Aug 2003 23:32:35 +0000
(23:32 +0000)
exists).
rsync.h
patch
|
blob
|
blame
|
history
diff --git
a/rsync.h
b/rsync.h
index
52b3e70
..
47943f3
100644
(file)
--- 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>