Commit e0cc8d2c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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

or not
parent 53c0e971

include/curl/curl.h

+3 −2
Original line number Diff line number Diff line
@@ -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. */