From e0cc8d2ce9b861d41b08d47f8574b710bcf95b53 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 14 Apr 2002 17:29:35 +0000 Subject: check for _MSC_VER as well as __STDC__ when deciding to use the ## operator or not --- include/curl/curl.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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. */ -- cgit v1.2.3