diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-13 18:23:53 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-13 18:23:53 +0300 |
| commit | 1e14067736bbff615f63e83129d64a17ad668390 (patch) | |
| tree | 110201972d71b85d5c8e4bf068770a1ffd6fca61 /strings/my_strtoll10.c | |
| parent | 99ed34376fde520a135756480334090db2a609a5 (diff) | |
| parent | 0d8977475630b214e2c4eecb1a33330cf9f7283b (diff) | |
| download | mariadb-git-1e14067736bbff615f63e83129d64a17ad668390.tar.gz | |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/m_string.h:
Auto merged
include/my_pthread.h:
Auto merged
myisam/mi_search.c:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/thr_alarm.c:
Auto merged
netware/pack_isam.def:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/xml.c:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
mysql-test/r/select.result:
Merged from 4.1.
netware/BUILD/mwenv:
Merged from 4.1.
scripts/make_binary_distribution.sh:
Merged from 4.1.
sql/mysqld.cc:
Merged from 4.1.
sql/sql_show.cc:
Merged from 4.1.
strings/my_strtoll10.c:
Merged from 4.1.
Diffstat (limited to 'strings/my_strtoll10.c')
| -rw-r--r-- | strings/my_strtoll10.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/strings/my_strtoll10.c b/strings/my_strtoll10.c index c1ad9bf1027..b9b09810c51 100644 --- a/strings/my_strtoll10.c +++ b/strings/my_strtoll10.c @@ -19,7 +19,10 @@ #include <m_string.h> #undef ULONGLONG_MAX -/* Needed under MetroWerks Compiler, since MetroWerks compiler does not properly handle a constant expression containing a mod operator */ +/* + Needed under MetroWerks Compiler, since MetroWerks compiler does not + properly handle a constant expression containing a mod operator +*/ #if defined(__NETWARE__) && defined(__MWERKS__) static ulonglong ulonglong_max= ~(ulonglong) 0; #define ULONGLONG_MAX ulonglong_max |