aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGisle Vanem <gvanem@broadpark.no>2005-12-20 22:20:42 +0000
committerGisle Vanem <gvanem@broadpark.no>2005-12-20 22:20:42 +0000
commit9e61dfe85e618c701b19cf5b83034578924b235c (patch)
tree034cac078ccfd325b3724e618bea6f3787d2fc89
parent7b51aafa86219025e94c9658a28f084b928f750c (diff)
Changes for PellesC compiler under Win32.
-rw-r--r--include/curl/curl.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 2d4201f17..0ac3f28ea 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -65,9 +65,11 @@ extern "C" {
* We want the typedef curl_off_t setup for large file support on all
* platforms. We also provide a CURL_FORMAT_OFF_T define to use in *printf
* format strings when outputting a variable of type curl_off_t.
+ *
+ * Note: "pocc -Ze" is MSVC compatibily mode and this sets _MSC_VER!
*/
-#if defined(_MSC_VER) || (defined(__LCC__) && defined(WIN32))
+#if (defined(_MSC_VER) && !defined(__POCC__)) || (defined(__LCC__) && defined(WIN32))
/* MSVC */
#ifdef _WIN32_WCE
typedef long curl_off_t;
@@ -76,7 +78,7 @@ extern "C" {
typedef signed __int64 curl_off_t;
#define CURL_FORMAT_OFF_T "%I64d"
#endif
-#else /* _MSC_VER || (defined(__LCC__) && defined(WIN32)) */
+#else /* (_MSC_VER && !__POCC__) || (__LCC__ && WIN32) */
#if (defined(__GNUC__) && defined(WIN32)) || defined(__WATCOMC__)
/* gcc on windows or Watcom */
typedef long long curl_off_t;
@@ -108,7 +110,7 @@ extern "C" {
#define CURL_FORMAT_OFF_T "%ld"
#endif
#endif /* GCC or Watcom on Windows */
-#endif /* _MSC_VER || (defined(__LCC__) && defined(WIN32)) */
+#endif /* (_MSC_VER && !__POCC__) || (__LCC__ && WIN32) */
#ifdef UNDEF_FILE_OFFSET_BITS
/* this was defined above for our checks, undefine it again */
@@ -400,7 +402,8 @@ typedef enum {
* platforms.
*/
#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
- defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__)
+ defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \
+ defined(__POCC__)
/* This compiler is believed to have an ISO compatible preprocessor */
#define CURL_ISOCPP
#else