Undefine symbols before redefining them.

diff --git a/lib/curlx.h b/lib/curlx.h
index 0dd9a0948bb30fb8311ad684718e941517caaac9..ffc860fc9cb6b88c74b8261e8ce1710e2b4d584e 100644 (file)
--- a/lib/curlx.h
+++ b/lib/curlx.h
@@ -79,7 +79,19 @@
 #ifdef ENABLE_CURLX_PRINTF
 /* If this define is set, we define all "standard" printf() functions to use
    the curlx_* version instead. It makes the source code transparant and
-   easier to understand/patch. */
+   easier to understand/patch. Undefine them first in case _MPRINTF_REPLACE
+   is set. */
+# undef printf
+# undef fprintf
+# undef sprintf
+# undef snprintf
+# undef vprintf
+# undef vfprintf
+# undef vsprintf
+# undef vsnprintf
+# undef aprintf
+# undef vaprintf
+
 # define printf curlx_mprintf
 # define fprintf curlx_mfprintf
 # define sprintf curlx_msprintf