From 7c9c505be6bbc3f1d86f3f0902f747c844ab61b3 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 11 Dec 2010 00:53:37 +0100
Subject: [PATCH 2/3] 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.
---
 lib/urldata.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/lib/urldata.h b/lib/urldata.h
index 47f5f79..83b646e 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
-- 
1.7.2.3

