From: Guenter Knauf <lists@gknw.net>
Date: Mon, 17 Jan 2011 00:27:57 +0000 (+0100)
Subject: Avoid redefines.
X-Git-Tag: curl-7_21_4~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef46fcdd908a7e8b0835ea63bd22d9c4e8f374a5;p=thirdparty%2Fcurl.git

Avoid redefines.
---

diff --git a/lib/setup.h b/lib/setup.h
index 63f51e4fb0..68c09a0910 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -162,13 +162,27 @@
  */
 
 #ifdef HTTP_ONLY
-#  define CURL_DISABLE_TFTP
-#  define CURL_DISABLE_FTP
-#  define CURL_DISABLE_LDAP
-#  define CURL_DISABLE_TELNET
-#  define CURL_DISABLE_DICT
-#  define CURL_DISABLE_FILE
-#  define CURL_DISABLE_RTSP
+#  ifndef CURL_DISABLE_TFTP
+#    define CURL_DISABLE_TFTP
+#  endif
+#  ifndef CURL_DISABLE_FTP
+#    define CURL_DISABLE_FTP
+#  endif
+#  ifndef CURL_DISABLE_LDAP
+#    define CURL_DISABLE_LDAP
+#  endif
+#  ifndef CURL_DISABLE_TELNET
+#    define CURL_DISABLE_TELNET
+#  endif
+#  ifndef CURL_DISABLE_DICT
+#    define CURL_DISABLE_DICT
+#  endif
+#  ifndef CURL_DISABLE_FILE
+#    define CURL_DISABLE_FILE
+#  endif
+#  ifndef CURL_DISABLE_RTSP
+#    define CURL_DISABLE_RTSP
+#  endif
 #endif
 
 /*