+2006-11-25

+ * Steve Peters <steve@fisharerojo.org>: OpenBSD has a malloc.h, + but warns to use stdlib.h instead + git-svn-id: http://code.sixapart.com/svn/memcached/trunk/server@448 b0b603af-a30f-0410-a34e-baf09ae79d0b
memcached · Nov 25, 2006 · 117ca7f · 117ca7f
1 parent c5944dc
commit 117ca7f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-25
+	* Steve Peters <steve@fisharerojo.org>: OpenBSD has a malloc.h,
+	but warns to use stdlib.h instead
+
 2006-11-13
 	* Iain Wade <iwade@optusnet.com.au>: Fix for UDP responses on non-"get"
 	 commands.

diff --git a/memcached.c b/memcached.c
@@ -51,8 +51,11 @@
 #include <limits.h>
 
 #ifdef HAVE_MALLOC_H
+/* OpenBSD has a malloc.h, but warns to use stdlib.h instead */
+#ifndef __OpenBSD__
 #include <malloc.h>
 #endif
+#endif
 
 /* FreeBSD 4.x doesn't have IOV_MAX exposed. */
 #ifndef IOV_MAX