diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2002-04-14 17:29:35 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2002-04-14 17:29:35 +0000 |
| commit | e0cc8d2ce9b861d41b08d47f8574b710bcf95b53 (patch) | |
| tree | 5b400c67a1cf4817d85d8a9af414ed817ed58a5b | |
| parent | 53c0e9711709d1e0430b8fbdd18702c195c8618d (diff) | |
check for _MSC_VER as well as __STDC__ when deciding to use the ## operator
or not
| -rw-r--r-- | include/curl/curl.h | 5 |
1 files 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. */ |