diff options
author | unknown <joerg@trift2.> | 2006-07-24 16:04:40 +0200 |
---|---|---|
committer | unknown <joerg@trift2.> | 2006-07-24 16:04:40 +0200 |
commit | 4e31c3fe609dd5e5a05692cd69bc31e243c749b8 (patch) | |
tree | da40932dbb7c1089ec453f7dd71b7d4606da9c1d /strings | |
parent | c98ff21c3a95f5b01e34078ab9b2466fdf2284d5 (diff) | |
parent | e732d3527f0e59b8a912fefd00b8dd9f489e5af0 (diff) | |
download | mariadb-git-4e31c3fe609dd5e5a05692cd69bc31e243c749b8.tar.gz |
Merge trift2.:/M41/push-1-4.1
into trift2.:/M50/merge-4.1-to-5.0
strings/strtod.c:
Manual merge: Null merge with header file cleanup ("my_base.h" includes "my_global.h", so we do not need both).
Diffstat (limited to 'strings')
-rw-r--r-- | strings/strtod.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/strings/strtod.c b/strings/strtod.c index e0910205d2f..7171a6e0801 100644 --- a/strings/strtod.c +++ b/strings/strtod.c @@ -26,8 +26,7 @@ */ -#include "my_base.h" /* Defines EOVERFLOW on Windows */ -#include "my_global.h" /* Includes errno.h */ +#include "my_base.h" /* Includes errno.h + EOVERFLOW */ #include "m_ctype.h" #define MAX_DBL_EXP 308 |