diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-09 15:47:59 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-09 15:47:59 +0200 |
| commit | 139a2b64bf8ec2e248656835e23a5c98ffc667a8 (patch) | |
| tree | 7d77d6f1073f8090f275b30cb3f10254497da243 /strings/strtol.c | |
| parent | b3f7eac5301529c2d069ebe4d0558980412af3a2 (diff) | |
| parent | ce675406ca8dbc1532a908803a1371de8432d466 (diff) | |
| download | mariadb-git-139a2b64bf8ec2e248656835e23a5c98ffc667a8.tar.gz | |
Merge with 5.2
Diffstat (limited to 'strings/strtol.c')
| -rw-r--r-- | strings/strtol.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/strings/strtol.c b/strings/strtol.c index 42476b0226a..b8269191aa7 100644 --- a/strings/strtol.c +++ b/strings/strtol.c @@ -20,8 +20,7 @@ functions, especially they handle tricks for Tru64 where 'long' is 64 bit already and our 'longlong' is just a 'long'. */ -#include <my_global.h> -#include <m_string.h> +#include "strings_def.h" #if !defined(MSDOS) && !defined(HAVE_STRTOL) && !defined(__WIN__) #include "strto.c" |