diff options
| author | monty@hundin.mysql.fi <> | 2001-08-18 10:49:00 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-08-18 10:49:00 +0300 |
| commit | b1cb5b6ff02ef6b7aa869e4191adc645b318cec6 (patch) | |
| tree | 6a8da232a534ba4330a0b544076af5db929af91b /strings | |
| parent | bfbc3252e18a17c12fa48a12f01a0223aed123af (diff) | |
| download | mariadb-git-b1cb5b6ff02ef6b7aa869e4191adc645b318cec6.tar.gz | |
Portability fixes.
Let myisamchk generate a new checksum for compressed data.
Don't unconditionally force filenames to lower case on windows.
Update mysqltest to match 4.0 source (to get some of the new bug fixes into 3.23)
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/strto.c | 10 | ||||
| -rw-r--r-- | strings/strtoll.c | 4 | ||||
| -rw-r--r-- | strings/strtoul.c | 2 | ||||
| -rw-r--r-- | strings/strtoull.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/strings/strto.c b/strings/strto.c index eb8caab2ab6..e2423ed2340 100644 --- a/strings/strto.c +++ b/strings/strto.c @@ -42,13 +42,13 @@ #include "my_sys.h" /* defines errno */ #include <errno.h> -#ifdef LONGLONG +#ifdef USE_LONGLONG #define UTYPE_MAX (~(ulonglong) 0) #define TYPE_MIN LONGLONG_MIN #define TYPE_MAX LONGLONG_MAX #define longtype longlong #define ulongtype ulonglong -#ifdef UNSIGNED +#ifdef USE_UNSIGNED #define function ulongtype strtoull #else #define function longtype strtoll @@ -59,7 +59,7 @@ #define TYPE_MAX LONG_MAX #define longtype long #define ulongtype unsigned long -#ifdef UNSIGNED +#ifdef USE_UNSIGNED #define function ulongtype strtoul #else #define function longtype strtol @@ -170,7 +170,7 @@ function (const char *nptr,char **endptr,int base) if (endptr != NULL) *endptr = (char *) s; -#ifndef UNSIGNED +#ifndef USE_UNSIGNED /* Check for a value that is within the range of `unsigned long int', but outside the range of `long int'. */ if (negative) @@ -185,7 +185,7 @@ function (const char *nptr,char **endptr,int base) if (overflow) { my_errno=ERANGE; -#ifdef UNSIGNED +#ifdef USE_UNSIGNED return UTYPE_MAX; #else return negative ? TYPE_MIN : TYPE_MAX; diff --git a/strings/strtoll.c b/strings/strtoll.c index f43dae726f5..678c28649ef 100644 --- a/strings/strtoll.c +++ b/strings/strtoll.c @@ -19,7 +19,7 @@ #include <global.h> #include <m_string.h> -#if !defined(HAVE_STRTOULL) && defined(HAVE_LONG_LONG) -#define LONGLONG +#if !defined(HAVE_STRTOLL) && defined(HAVE_LONG_LONG) +#define USE_LONGLONG #include "strto.c" #endif diff --git a/strings/strtoul.c b/strings/strtoul.c index bbfaa6ad22a..e49a9ebea6a 100644 --- a/strings/strtoul.c +++ b/strings/strtoul.c @@ -19,6 +19,6 @@ #include <global.h> #if !defined(MSDOS) && !defined(HAVE_STRTOUL) -#define UNSIGNED +#define USE_UNSIGNED #include "strto.c" #endif diff --git a/strings/strtoull.c b/strings/strtoull.c index 42ce5ea4177..74dab95b801 100644 --- a/strings/strtoull.c +++ b/strings/strtoull.c @@ -20,7 +20,7 @@ #include <global.h> #include <m_string.h> #if !defined(HAVE_STRTOULL) && defined(HAVE_LONG_LONG) -#define UNSIGNED -#define LONGLONG +#define USE_UNSIGNED +#define USE_LONGLONG #include "strto.c" #endif |