aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-10-10 03:28:51 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-10-10 03:28:51 +0000
commit34750cc738214008a6098e554584c2d88677ed92 (patch)
tree9098d8daf48786e18ac8dbdfc94e28ee59443463
parentaf677c4e1d399a8b3111435ff3c0691a27075735 (diff)
Use LL suffix for long long constants if the compiler supports it, to prevent
warnings.
-rw-r--r--lib/strtoofft.c4
-rw-r--r--lib/strtoofft.h18
2 files changed, 15 insertions, 7 deletions
diff --git a/lib/strtoofft.c b/lib/strtoofft.c
index f6abc20a0..391f80d24 100644
--- a/lib/strtoofft.c
+++ b/lib/strtoofft.c
@@ -112,9 +112,9 @@ curlx_strtoll(const char *nptr, char **endptr, int base)
}
else {
if (is_negative)
- value = 0x8000000000000000L;
+ value = CURL_LLONG_MIN;
else
- value = 0x7FFFFFFFFFFFFFFFL;
+ value = CURL_LLONG_MAX;
errno = ERANGE;
}
diff --git a/lib/strtoofft.h b/lib/strtoofft.h
index 4c5d2652b..c92cbeff7 100644
--- a/lib/strtoofft.h
+++ b/lib/strtoofft.h
@@ -1,10 +1,10 @@
#ifndef _CURL_STRTOOFFT_H
#define _CURL_STRTOOFFT_H
/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
@@ -12,7 +12,7 @@
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://curl.haxx.se/docs/copyright.html.
- *
+ *
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
@@ -58,5 +58,13 @@ curl_off_t curlx_strtoll(const char *nptr, char **endptr, int base);
#define curlx_strtoofft strtol
#endif
+#ifdef HAVE_LL
+#define CURL_LLONG_MIN 0x8000000000000000LL
+#define CURL_LLONG_MAX 0x7FFFFFFFFFFFFFFFLL
+#else
+#define CURL_LLONG_MIN 0x8000000000000000L
+#define CURL_LLONG_MAX 0x7FFFFFFFFFFFFFFFL
+#endif
+
#endif