From: Marcel Raad <Marcel.Raad@teamviewer.com>
Date: Sat, 3 Mar 2018 18:52:43 +0000 (+0100)
Subject: curl_ctype: fix macro redefinition warnings
X-Git-Tag: curl-7_59_0~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68d84cfe984e7d0483fad14fdd7deef4bf67de1b;p=curl

curl_ctype: fix macro redefinition warnings

On MinGW and Cygwin, GCC and clang have been complaining about macro
redefinitions since 4272a0b0fc49a1ac0ceab5c4a365c9f6ab8bf8e2. Fix this
by undefining the macros before redefining them as suggested in
https://github.com/curl/curl/pull/2269.

Suggested-by: Daniel Stenberg
---

diff --git a/lib/curl_ctype.c b/lib/curl_ctype.c
index 70db1630d..4f5abc207 100644
--- a/lib/curl_ctype.c
+++ b/lib/curl_ctype.c
@@ -22,13 +22,21 @@
 
 #include "curl_setup.h"
 
+#undef _U
 #define _U (1<<0) /* upper case */
+#undef _L
 #define _L (1<<1) /* lower case */
+#undef _N
 #define _N (1<<2) /* decimal numerical digit */
+#undef _S
 #define _S (1<<3) /* space */
+#undef _P
 #define _P (1<<4) /* punctuation */
+#undef _C
 #define _C (1<<5) /* control */
+#undef _X
 #define _X (1<<6) /* hexadecimal letter */
+#undef _B
 #define _B (1<<7) /* blank */
 
 static const unsigned char ascii[128] = {