summaryrefslogtreecommitdiff
path: root/include/errmsg.h
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2006-04-15 08:49:00 -0700
committerunknown <brian@zim.(none)>2006-04-15 08:49:00 -0700
commit06e8697d04ea7ecc28aed3ae7d68a3156546004c (patch)
tree0016808c56b0545d9e84a1650e620b6bf9dc516b /include/errmsg.h
parent1b2312211f3938a45a79ea49ead7f3660fbb2c3e (diff)
downloadmariadb-git-06e8697d04ea7ecc28aed3ae7d68a3156546004c.tar.gz
Another long patch to remove the rest of the OS2 support.
include/config-win.h: Removing OS2 stuff include/errmsg.h: Removing OS2 stuff include/m_string.h: OS2 removal include/my_global.h: OS2 removal include/my_net.h: OS2 removal include/my_no_pthread.h: OS2 removal include/my_pthread.h: OS2 removal include/thr_alarm.h: OS2 removal mysys/default.c: OS2 removal mysys/mf_path.c: OS2 removal mysys/mf_tempdir.c: OS2 removal mysys/mf_tempfile.c: OS2 removal mysys/my_access.c: OS2 removal mysys/my_clock.c: OS2 removal mysys/my_copy.c: OS2 removal mysys/my_create.c: OS2 removal mysys/my_dup.c: OS2 removal mysys/my_file.c: OS2 removal mysys/my_getwd.c: OS2 removal mysys/my_init.c: OS2 removal mysys/my_lib.c: OS2 removal mysys/my_lock.c: OS2 removal mysys/my_mkdir.c: OS2 removal mysys/my_open.c: OS2 removal mysys/my_pthread.c: OS2 removal mysys/my_redel.c: OS2 removal mysys/my_sleep.c: OS2 removal mysys/my_static.c: OS2 removal mysys/my_thr_init.c: OS2 removal mysys/thr_alarm.c: OS2 removal storage/myisam/myisamchk.c: OS2 removal
Diffstat (limited to 'include/errmsg.h')
-rw-r--r--include/errmsg.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/errmsg.h b/include/errmsg.h
index 1dd5759c104..4018e3ee01d 100644
--- a/include/errmsg.h
+++ b/include/errmsg.h
@@ -29,9 +29,7 @@ extern const char *client_errors[]; /* Error messages */
#define CR_MIN_ERROR 2000 /* For easier client code */
#define CR_MAX_ERROR 2999
-#if defined(OS2) && defined(MYSQL_SERVER)
-#define CER(X) client_errors[(X)-CR_MIN_ERROR]
-#elif !defined(ER)
+#if !defined(ER)
#define ER(X) client_errors[(X)-CR_MIN_ERROR]
#endif
#define CLIENT_ERRMAP 2 /* Errormap used by my_error() */