diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_string.h | 6 | ||||
| -rw-r--r-- | include/my_global.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/m_string.h b/include/m_string.h index c580e38e177..d7086555b1e 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -52,7 +52,7 @@ #endif /* This is needed for the definitions of bzero... on solaris */ -#if defined(HAVE_STRINGS_H) && !defined(HAVE_mit_thread) +#if defined(HAVE_STRINGS_H) #include <strings.h> #endif @@ -95,7 +95,7 @@ extern "C" { extern void *(*my_str_malloc)(size_t); extern void (*my_str_free)(void *); -#if defined(HAVE_STPCPY) && !defined(HAVE_mit_thread) +#if defined(HAVE_STPCPY) #define strmov(A,B) stpcpy((A),(B)) #ifndef stpcpy extern char *stpcpy(char *, const char *); /* For AIX with gcc 2.95.3 */ @@ -243,7 +243,7 @@ longlong my_strtoll10(const char *nptr, char **endptr, int *error); #ifdef HAVE_LONG_LONG extern char *longlong2str(longlong val,char *dst,int radix); extern char *longlong10_to_str(longlong val,char *dst,int radix); -#if (!defined(HAVE_STRTOULL) || defined(HAVE_mit_thread)) || defined(NO_STRTOLL_PROTO) +#if (!defined(HAVE_STRTOULL) || defined(NO_STRTOLL_PROTO) extern longlong strtoll(const char *str, char **ptr, int base); extern ulonglong strtoull(const char *str, char **ptr, int base); #endif diff --git a/include/my_global.h b/include/my_global.h index 500481fd6b8..42a93fb5e63 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -206,7 +206,6 @@ /* The client defines this to avoid all thread code */ #if defined(UNDEF_THREADS_HACK) #undef THREAD -#undef HAVE_mit_thread #undef HAVE_LINUXTHREADS #undef HAVE_NPTL #undef HAVE_UNIXWARE7_THREADS |