diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-15 15:09:22 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-15 15:09:22 +0200 |
| commit | a9035be5b7a7b3865ddb4ef34a5d0cfc65dfc254 (patch) | |
| tree | a9df7341e91623f62fe37cd47fce139d8888fc95 /strings/ctype-ucs2.c | |
| parent | 3a1c91d87d69ef243b3e78be6089102cafef0a8e (diff) | |
| parent | f57ecb7786177e0af3b1e3ec94302720b2e0f967 (diff) | |
| download | mariadb-git-a9035be5b7a7b3865ddb4ef34a5d0cfc65dfc254.tar.gz | |
10.0-base merge
Diffstat (limited to 'strings/ctype-ucs2.c')
| -rw-r--r-- | strings/ctype-ucs2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index fa43f36fb84..edb42862e50 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -1,5 +1,5 @@ /* Copyright (c) 2003, 2012, Oracle and/or its affiliates - Copyright (c) 2009, 2011, Monty Program Ab + Copyright (c) 2009, 2013, Monty Program Ab. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -40,11 +40,11 @@ #undef ULONGLONG_MAX #define ULONGLONG_MAX (~(ulonglong) 0) -#define MAX_NEGATIVE_NUMBER ((ulonglong) LL(0x8000000000000000)) +#define MAX_NEGATIVE_NUMBER ((ulonglong) 0x8000000000000000LL) #define INIT_CNT 9 -#define LFACTOR ULL(1000000000) -#define LFACTOR1 ULL(10000000000) -#define LFACTOR2 ULL(100000000000) +#define LFACTOR 1000000000ULL +#define LFACTOR1 10000000000ULL +#define LFACTOR2 100000000000ULL #if defined(HAVE_CHARSET_utf32) || defined(HAVE_CHARSET_mb2) static unsigned long lfactor[9]= |