From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 14 Apr 2002 17:29:35 +0000 (+0000)
Subject: check for _MSC_VER as well as __STDC__ when deciding to use the ## operator
X-Git-Tag: curl-7_9_6~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0cc8d2ce9b861d41b08d47f8574b710bcf95b53;p=curl

check for _MSC_VER as well as __STDC__ when deciding to use the ## operator
or not
---

diff --git a/include/curl/curl.h b/include/curl/curl.h
index a5354758f..a621775f9 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -209,7 +209,7 @@ typedef enum {
 #ifdef CINIT
 #undef CINIT
 #endif
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_MSC_VER)
 #define CINIT(name,type,number) CURLOPT_ ## name = CURLOPTTYPE_ ## type + number
 #else
 /* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
@@ -595,7 +595,8 @@ int curl_formparse(char *, struct curl_httppost **,
 #ifdef CFINIT
 #undef CFINIT
 #endif
-#ifdef __STDC__
+
+#if defined(__STDC__) || defined(_MSC_VER)
 #define CFINIT(name) CURLFORM_ ## name
 #else
 /* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */