diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2010-12-11 00:53:37 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2010-12-15 16:05:17 +0100 |
| commit | b998b04c025e5c7ed201c14af9f4b29f8ba3ff7a (patch) | |
| tree | 2dfd70d32810090ea015d3ba9d013bd3d223741b | |
| parent | 68b2a9818b296038bf601d9578bd424ae901ad3f (diff) | |
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.
| -rw-r--r-- | lib/urldata.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/urldata.h b/lib/urldata.h index 47f5f7962..83b646ea5 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 |