summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert James Kaes <rjkaes@users.sourceforge.net>2002-04-09 22:02:05 +0000
committerRobert James Kaes <rjkaes@users.sourceforge.net>2002-04-09 22:02:05 +0000
commit4fa5cef49117a02600a53b21c343ed8ce6d508ce (patch)
treeca45925b0a88a0e08f951ba6a83a0b264f5a82bd
parentfb616011efb62d3cfb96969eba814aae042a047e (diff)
downloadtinyproxy-4fa5cef49117a02600a53b21c343ed8ce6d508ce.tar.gz
tinyproxy-4fa5cef49117a02600a53b21c343ed8ce6d508ce.zip
The malloc/free functions should be in stdlib.h, but if we can't find
stdlib.h then try including malloc.h. Maybe this will allow clean compiling on some platforms.
Diffstat (limited to '')
-rw-r--r--src/tinyproxy.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/tinyproxy.h b/src/tinyproxy.h
index 9da6b59..dfbceea 100644
--- a/src/tinyproxy.h
+++ b/src/tinyproxy.h
@@ -1,4 +1,4 @@
-/* $Id: tinyproxy.h,v 1.26 2001-12-28 22:31:12 rjkaes Exp $
+/* $Id: tinyproxy.h,v 1.27 2002-04-09 22:02:05 rjkaes Exp $
*
* See 'tinyproxy.c' for a detailed description.
*
@@ -101,9 +101,6 @@
#ifdef HAVE_GRP_H
# include <grp.h>
#endif
-#ifdef HAVE_MALLOC_H
-# include <malloc.h>
-#endif
#ifdef HAVE_MEMORY_H
# include <memory.h>
#endif
@@ -131,6 +128,10 @@
#endif
#ifdef HAVE_STDLIB_H
# include <stdlib.h>
+#else
+# ifdef HAVE_MALLOC_H
+# include <malloc.h>
+# endif
#endif
#ifdef HAVE_STRING_H
# include <string.h>