diff options
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/include/my_global.h b/include/my_global.h index 5e99c579bfd..f3e6ae1633a 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -82,20 +82,7 @@ #define CPP_UNNAMED_NS_END } #endif -#if defined(_WIN32) #include <my_config.h> -#elif defined(__NETWARE__) -#include <my_config.h> -#include <config-netware.h> -#if defined(__cplusplus) && defined(inline) -#undef inline /* fix configure problem */ -#endif -#else -#include <my_config.h> -#if defined(__cplusplus) && defined(inline) -#undef inline /* fix configure problem */ -#endif -#endif /* _WIN32... */ #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE #define HAVE_PSI_INTERFACE @@ -108,12 +95,6 @@ #define IF_WIN(A,B) B #endif -#ifdef __NETWARE__ -#define IF_NETWARE(A,B) A -#else -#define IF_NETWARE(A,B) B -#endif - #ifndef DBUG_OFF #define IF_DBUG(A,B) A #else @@ -143,12 +124,6 @@ #define HAVE_EXTERNAL_CLIENT #endif -/* Some defines to avoid ifdefs in the code */ -#ifndef NETWARE_YIELD -#define NETWARE_YIELD -#define NETWARE_SET_SCREEN_MODE(A) -#endif - #if defined (_WIN32) /* off_t is 32 bit long. We do not use C runtime functions @@ -1677,25 +1652,12 @@ do { doubleget_union _tmp; \ #endif -#ifndef __NETWARE__ /* * Include standard definitions of operator new and delete. */ #ifdef __cplusplus #include <new> #endif -#else -/* - * Define placement versions of operator new and operator delete since - * we don't have <new> when building for Netware. - */ -#ifdef __cplusplus -inline void *operator new(size_t, void *ptr) { return ptr; } -inline void *operator new[](size_t, void *ptr) { return ptr; } -inline void operator delete(void*, void*) { /* Do nothing */ } -inline void operator delete[](void*, void*) { /* Do nothing */ } -#endif -#endif /* Length of decimal number represented by INT32. */ #define MY_INT32_NUM_DECIMAL_DIGITS 11 |