From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 10 Dec 2010 23:53:37 +0000 (+0100)
Subject: urldate: undef hideous memory defines
X-Git-Tag: curl-7_21_4~156
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b998b04c025e5c7ed201c14af9f4b29f8ba3ff7a;p=thirdparty%2Fcurl.git

urldate: undef hideous memory defines

The public axTLS header (at least as of 1.2.7) redefines the memory
functions. We #undef those again immediately after the public header to
limit the damage. This should be fixed in axTLS.
---

diff --git a/lib/urldata.h b/lib/urldata.h
index 47f5f79628..83b646ea5c 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -122,6 +122,9 @@
 
 #ifdef USE_AXTLS
 #include <axTLS/ssl.h>
+#undef malloc
+#undef calloc
+#undef realloc
 #endif /* USE_AXTLS */
 
 #ifdef HAVE_NETINET_IN_H