Răsfoiți Sursa

COMP: Do not #include files inside extern "C" {} blocks.

Brad King 18 ani în urmă
părinte
comite
d7eeead8dc
1 a modificat fișierele cu 15 adăugiri și 0 ștergeri
  1. 15 0
      Utilities/cmcurl/curl/curl.h

+ 15 - 0
Utilities/cmcurl/curl/curl.h

@@ -139,6 +139,10 @@ extern "C" {
 #define WIN32 1
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) && \
   !defined(__CYGWIN__) || defined(__MINGW32__)
 #if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H))
@@ -164,6 +168,10 @@ extern "C" {
 #include <sys/types.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef curl_socket_typedef
 /* socket typedef */
 #ifdef WIN32
@@ -1121,10 +1129,17 @@ typedef enum {
   CURL_TIMECOND_LAST
 } curl_TimeCond;
 
+#ifdef __cplusplus
+}
+#endif
+
 #ifdef __BEOS__
 #include <support/SupportDefs.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* curl_strequal() and curl_strnequal() are subject for removal in a future
    libcurl, see lib/README.curlx for details */