From: Wilfried Goesgens <dothebart@citadel.org>
Date: Tue, 24 Jul 2012 07:49:44 +0000 (+0200)
Subject: MacOSX compatibility: check whether memcpy is a macro, and if #undef it to get the... 
X-Git-Tag: v8.20~291
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=b2341111a6a40427f8c7991c34d99af8b25ac6e1

MacOSX compatibility: check whether memcpy is a macro, and if #undef it to get the original function.
---

diff --git a/libcitadel/configure.in b/libcitadel/configure.in
index fb45b74a2..76867ee12 100755
--- a/libcitadel/configure.in
+++ b/libcitadel/configure.in
@@ -10,6 +10,7 @@ AC_INIT(libcitadel, 3.8.13, http://uncensored.citadel.org)
 AC_CONFIG_SRCDIR(Makefile.in)
 AC_CONFIG_AUX_DIR(conftools)
 AC_CONFIG_SRCDIR(tests/Makefile.in)
+m4_include([m4/local.m4])
 
 dnl
 dnl Increment LIBREVISION if source code has changed at all
@@ -103,6 +104,36 @@ AC_TRY_COMPILE([
 		]
 )
 
+AC_MSG_CHECKING([whether your system likes memcpy + HKEY]) 
+AC_TRY_COMPILE([
+#define _GNU_SOURCE
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <sys/select.h>
+#include <fcntl.h>
+#include <sys/types.h>
+
+#include "lib/libcitadel.h"
+],
+[
+	char foo[22];
+	memcpy(foo, HKEY("foo"));
+	
+],
+		[
+
+		  AC_MSG_RESULT([yes])
+		],
+		[ 
+		  AC_DEFINE(UNDEF_MEMCPY, [], [whether we need to undefine memcpy])
+		  AC_MSG_RESULT([no])
+		]
+)
+
 
 AC_CHECK_HEADERS(iconv.h)
 
diff --git a/libcitadel/lib/stringbuf.c b/libcitadel/lib/stringbuf.c
index 963c55f6a..ba88a2f43 100644
--- a/libcitadel/lib/stringbuf.c
+++ b/libcitadel/lib/stringbuf.c
@@ -40,8 +40,8 @@
 #include <execinfo.h>
 #endif
 
-#ifdef LINUX_SENDFILE
-#include <sys/sendfile.h>
+#ifdef UNDEF_MEMCPY
+#undef memcpy
 #endif
 
 #ifdef HAVE_ZLIB
diff --git a/webcit/configure.ac b/webcit/configure.ac
index 5fc9194ce..9b33da91b 100644
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -252,6 +252,35 @@ AC_CHECK_HEADER(libcitadel.h,
 	]
 )
 
+AC_MSG_CHECKING([whether your system likes memcpy + HKEY]) 
+AC_TRY_COMPILE([
+#define _GNU_SOURCE
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <sys/select.h>
+#include <fcntl.h>
+#include <sys/types.h>
+
+#include "lib/libcitadel.h"
+],
+[
+	char foo[22];
+	memcpy(foo, HKEY("foo"));
+	
+],
+		[
+
+		  AC_MSG_RESULT([yes])
+		],
+		[ 
+		  AC_DEFINE(UNDEF_MEMCPY, [], [whether we need to undefine memcpy])
+		  AC_MSG_RESULT([no])
+		]
+)
 
 dnl Checks for the Expat XML parser.
 AC_CHECK_HEADER(expat.h,
diff --git a/webcit/webcit.h b/webcit/webcit.h
index b34400920..342571fcb 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -123,6 +123,10 @@ extern char *ssl_cipher_list;
 
 #define TRACE syslog(LOG_DEBUG, "\033[3%dmCHECKPOINT: %s:%d\033[0m", ((__LINE__%6)+1), __FILE__, __LINE__)
 
+#ifdef UNDEF_MEMCPY
+#undef memcpy
+#endif
+
 #define SLEEPING		180		/* TCP connection timeout */
 #define WEBCIT_TIMEOUT		900		/* WebCit session timeout */
 #define PORT_NUM		2000		/* port number to listen on */