diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/errmsg.h | 5 | ||||
| -rw-r--r-- | include/m_string.h | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/errmsg.h b/include/errmsg.h index 7a967954bab..8087c526937 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -29,8 +29,11 @@ extern const char *client_errors[]; /* Error messages */ #define CR_MIN_ERROR 2000 /* For easier client code */ #define CR_MAX_ERROR 2999 -#undef ER +#if defined(OS2) && defined( MYSQL_SERVER) +#define CER(X) client_errors[(X)-CR_MIN_ERROR] +#else #define ER(X) client_errors[(X)-CR_MIN_ERROR] +#endif #define CLIENT_ERRMAP 2 /* Errormap used by my_error() */ #define CR_UNKNOWN_ERROR 2000 diff --git a/include/m_string.h b/include/m_string.h index 84c42e0c8b9..7eb2f1fe690 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -82,7 +82,7 @@ # define bmove_allign(A,B,C) memcpy((A),(B),(C)) #endif -#ifdef __cplusplus +#if defined(__cplusplus) && !defined(OS2) extern "C" { #endif @@ -238,7 +238,7 @@ extern ulonglong strtoull(const char *str, char **ptr, int base); #endif #endif -#ifdef __cplusplus +#if defined(__cplusplus) && !defined(OS2) } #endif #endif |