From: Michal Marek <mmarek@suse.cz>
Date: Mon, 14 Apr 2008 19:01:41 +0000 (+0000)
Subject: allow disabling the typechecker by defining CURL_DISABLE_TYPECHECK, as
X-Git-Tag: upstream/7.37.1~7910
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af41ada7aa5ee4db20107c8bd4a06fec3e422fb8;p=platform%2Fupstream%2Fcurl.git

allow disabling the typechecker by defining CURL_DISABLE_TYPECHECK, as
discussed in http://curl.haxx.se/mail/lib-2008-04/0291.html
---

diff --git a/CHANGES b/CHANGES
index 04c0a70..812a88b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@
                                   Changelog
 
 
+Michal Marek (14 Apr 2008)
+- allow disabling the typechecker by defining CURL_DISABLE_TYPECHECK, as
+  discussed in http://curl.haxx.se/mail/lib-2008-04/0291.html
+
 Daniel Stenberg (14 Apr 2008)
 - Stefan Krause reported a case where the OpenSSL handshake phase wasn't
   properly acknowledging the timeout values, like if you pulled the network
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a606702..9549b1b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -21,6 +21,7 @@ This release includes the following bugfixes:
  o configure now correctly recognizes Heimdal and MIT gssapi libraries
  o malloc() failure check in Negotiate
  o -i and -I together now work the same no matter what order they're used
+ * the typechecker can be bypassed by defining CURL_DISABLE_TYPECHECK
 
 This release includes the following known bugs:
 
@@ -38,6 +39,7 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  Michal Marek, Daniel Fandrich, Scott Barrett, Alexey Simak, Daniel Black,
- Rafa Muyo, Andre Guibert de Bruet, Brock Noland, Sandor Feldi, Stefan Krause
+ Rafa Muyo, Andre Guibert de Bruet, Brock Noland, Sandor Feldi, Stefan Krause,
+ David Shaw
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/include/curl/curl.h b/include/curl/curl.h
index bd188cd..ab6c863 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -1801,7 +1801,7 @@ CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
 
 /* the typechecker doesn't work in C++ (yet) */
 #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && \
-    !defined(__cplusplus)
+    !defined(__cplusplus) && !defined(CURL_DISABLE_TYPECHECK)
 #include "typecheck-gcc.h"
 #else
 #if defined(__STDC__) && (__STDC__ >= 1)