mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 08:08:50 -05:00
improved the check for an ISO cpp by checking specificly for __BORLANDC__
too, as Emiliano Ida has confirmed it to work
This commit is contained in:
parent
c27c9f80d2
commit
3fa353a2d3
@ -242,7 +242,15 @@ typedef enum {
|
|||||||
* platforms.
|
* platforms.
|
||||||
*/
|
*/
|
||||||
#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
|
#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
|
||||||
defined(__HP_aCC)
|
defined(__HP_aCC) || defined(__BORLANDC__)
|
||||||
|
/* This compiler is believed to have an ISO compatible preprocessor */
|
||||||
|
#define CURL_ISOCPP
|
||||||
|
#else
|
||||||
|
/* This compiler is believed NOT to have an ISO compatible preprocessor */
|
||||||
|
#undef CURL_ISOCPP
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CURL_ISOCPP
|
||||||
#define CINIT(name,type,number) CURLOPT_ ## name = CURLOPTTYPE_ ## type + number
|
#define CINIT(name,type,number) CURLOPT_ ## name = CURLOPTTYPE_ ## type + number
|
||||||
#else
|
#else
|
||||||
/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
|
/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
|
||||||
@ -689,8 +697,7 @@ int curl_formparse(char *, struct curl_httppost **,
|
|||||||
#undef CFINIT
|
#undef CFINIT
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
|
#ifdef CURL_ISOCPP
|
||||||
defined(__HP_aCC)
|
|
||||||
#define CFINIT(name) CURLFORM_ ## name
|
#define CFINIT(name) CURLFORM_ ## name
|
||||||
#else
|
#else
|
||||||
/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
|
/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
|
||||||
@ -793,8 +800,8 @@ CURLcode curl_global_init(long flags);
|
|||||||
void curl_global_cleanup(void);
|
void curl_global_cleanup(void);
|
||||||
|
|
||||||
/* This is the version number */
|
/* This is the version number */
|
||||||
#define LIBCURL_VERSION "7.10.1"
|
#define LIBCURL_VERSION "7.10.2-test"
|
||||||
#define LIBCURL_VERSION_NUM 0x070a01
|
#define LIBCURL_VERSION_NUM 0x070a02
|
||||||
|
|
||||||
/* linked-list structure for the CURLOPT_QUOTE option (and other) */
|
/* linked-list structure for the CURLOPT_QUOTE option (and other) */
|
||||||
struct curl_slist {
|
struct curl_slist {
|
||||||
|
Loading…
Reference in New Issue
Block a user