summaryrefslogtreecommitdiff
path: root/include/errmsg.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/errmsg.h')
-rw-r--r--include/errmsg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/errmsg.h b/include/errmsg.h
index 5f462565e33..1f4e6e12f00 100644
--- a/include/errmsg.h
+++ b/include/errmsg.h
@@ -30,7 +30,7 @@ extern const char *client_errors[]; /* Error messages */
#define CR_MAX_ERROR 2999
#if defined(OS2) && defined(MYSQL_SERVER)
#define CER(X) client_errors[(X)-CR_MIN_ERROR]
-#else
+#elif !defined(ER)
#define ER(X) client_errors[(X)-CR_MIN_ERROR]
#endif
#define CLIENT_ERRMAP 2 /* Errormap used by my_error() */