summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-05-14 01:24:17 +0200
committerunknown <serg@serg.mylan>2004-05-14 01:24:17 +0200
commit39b2b685449832721107fade8833e55c56115546 (patch)
tree5a9232869d6af479ebb88e6ce1f5c951030bc501 /strings
parent8d32f377d8830d1762f4eb3202b31d0cc1d5533a (diff)
downloadmariadb-git-39b2b685449832721107fade8833e55c56115546.tar.gz
compatibility fix for hp-ux 64bit (hpux compiler) and sun 64-bit (sun forte)
Diffstat (limited to 'strings')
-rw-r--r--strings/my_strtoll10.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/strings/my_strtoll10.c b/strings/my_strtoll10.c
index 349350c6c7a..493d0d63de2 100644
--- a/strings/my_strtoll10.c
+++ b/strings/my_strtoll10.c
@@ -22,9 +22,9 @@
#define ULONGLONG_MAX (~(ulonglong) 0)
#define MAX_NEGATIVE_NUMBER ((ulonglong) LL(0x8000000000000000))
#define INIT_CNT 9
-#define LFACTOR LL(1000000000)
-#define LFACTOR1 LL(10000000000)
-#define LFACTOR2 LL(100000000000)
+#define LFACTOR ULL(1000000000)
+#define LFACTOR1 ULL(10000000000)
+#define LFACTOR2 ULL(100000000000)
static unsigned long lfactor[9]=
{
@@ -113,8 +113,8 @@ longlong my_strtoll10(const char *nptr, char **endptr, int *error)
negative= 1;
if (++s == end)
goto no_conv;
- cutoff= MAX_NEGATIVE_NUMBER / LL(100000000000);
- cutoff2= (MAX_NEGATIVE_NUMBER % LL(100000000000)) / 100;
+ cutoff= MAX_NEGATIVE_NUMBER / LFACTOR2;
+ cutoff2= (MAX_NEGATIVE_NUMBER % LFACTOR2) / 100;
cutoff3= MAX_NEGATIVE_NUMBER % 100;
}
else
@@ -125,8 +125,8 @@ longlong my_strtoll10(const char *nptr, char **endptr, int *error)
if (++s == end)
goto no_conv;
}
- cutoff= ULONGLONG_MAX / LL(100000000000);
- cutoff2= ULONGLONG_MAX % LL(100000000000) / 100;
+ cutoff= ULONGLONG_MAX / LFACTOR2;
+ cutoff2= ULONGLONG_MAX % LFACTOR2 / 100;
cutoff3= ULONGLONG_MAX % 100;
}