[memcached] bradfitz, r448: +2006-11-25

[commits at code.sixapart.com]

+2006-11-25
+       * Steve Peters <steve at fisharerojo.org>: OpenBSD has a malloc.h,
+       but warns to use stdlib.h instead
+



U   trunk/server/ChangeLog
U   trunk/server/memcached.c


Modified: trunk/server/ChangeLog
===================================================================
--- trunk/server/ChangeLog	2006-11-24 08:15:44 UTC (rev 447)
+++ trunk/server/ChangeLog	2006-11-25 20:12:55 UTC (rev 448)
@@ -1,3 +1,7 @@
+2006-11-25
+	* Steve Peters <steve at fisharerojo.org>: OpenBSD has a malloc.h,
+	but warns to use stdlib.h instead
+
 2006-11-13
 	* Iain Wade <iwade at optusnet.com.au>: Fix for UDP responses on non-"get"
 	 commands.

Modified: trunk/server/memcached.c
===================================================================
--- trunk/server/memcached.c	2006-11-24 08:15:44 UTC (rev 447)
+++ trunk/server/memcached.c	2006-11-25 20:12:55 UTC (rev 448)
@@ -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