summaryrefslogtreecommitdiff
path: root/include/m_string.h
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-02-13 15:27:21 +0100
committerunknown <serg@serg.mylan>2004-02-13 15:27:21 +0100
commit98150adcec185a147426a2cea5d7ea582c609fd2 (patch)
treee72eb3285c6d77bd43ee040603595ce715626551 /include/m_string.h
parent5beeb066ad74dbca5d663915bb1b83277a96f5d7 (diff)
downloadmariadb-git-98150adcec185a147426a2cea5d7ea582c609fd2.tar.gz
my_atof is deleted
strtod from mit-threads is restored and cleaned up BitKeeper/deleted/.del-atof.c~d3edf47a9884080: Delete: strings/atof.c configure.in: atod() is no longer used in MySQL isinf() now is include/m_string.h: my_strtod, my_atof include/my_global.h: my_atof is deleted define isinf() libmysql/Makefile.shared: use internal strtod sql/gstream.cc: use internal strtod sql/init.cc: my_atof is deleted sql/item.h: use internal strtod sql/item_func.cc: use internal strtod sql/item_sum.h: use internal strtod sql/sql_analyse.cc: use internal strtod strings/Makefile.am: use internal strtod strings/ctype-simple.c: use internal strtod strings/ctype-ucs2.c: use internal strtod strings/strtod.c: cleanup stricter input checks (e.g. ".E10" is no longer a number) don't return an "inf"
Diffstat (limited to 'include/m_string.h')
-rw-r--r--include/m_string.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/m_string.h b/include/m_string.h
index d72342fb3c1..ac2aae37704 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -201,7 +201,7 @@ extern int strcmp(const char *, const char *);
extern size_t strlen(const char *);
#endif
#endif
-#ifndef HAVE_STRNLEN
+#ifndef HAVE_STRNLEN
extern uint strnlen(const char *s, uint n);
#endif
@@ -215,7 +215,9 @@ extern char *strstr(const char *, const char *);
#endif
extern int is_prefix(const char *, const char *);
-/* Conversion rutins */
+/* Conversion routines */
+double my_strtod(const char *str, char **end);
+double my_atof(const char *nptr);
#ifdef USE_MY_ITOA
extern char *my_itoa(int val,char *dst,int radix);