summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <jani@hynda.mysql.fi>2002-03-13 01:28:13 +0200
committerunknown <jani@hynda.mysql.fi>2002-03-13 01:28:13 +0200
commitd716037e6ea6d6b0ff42ed9ad544529b0b37e261 (patch)
tree85df10184368163650d096e55e2c9127a0c3e769 /include
parent0e43a70453321aac082c4c44665b3dca84be0e3d (diff)
downloadmariadb-git-d716037e6ea6d6b0ff42ed9ad544529b0b37e261.tar.gz
Modifications to MySQL source in order to make it compile on QnX.
config.guess: Added detection for QNX. config.sub: Added detection for QNX. include/m_ctype.h: QNX already used some of the symbols, changed names. include/my_global.h: For QNX. readline/vi_mode.c: For QNX.
Diffstat (limited to 'include')
-rw-r--r--include/m_ctype.h36
-rw-r--r--include/my_global.h8
2 files changed, 26 insertions, 18 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h
index 61afcb7245e..fc983d1d580 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -91,10 +91,10 @@ extern const char *compiled_charset_name(uint charset_number);
#define _U 01 /* Upper case */
#define _L 02 /* Lower case */
-#define _N 04 /* Numeral (digit) */
-#define _S 010 /* Spacing character */
-#define _P 020 /* Punctuation */
-#define _C 040 /* Control character */
+#define _NMR 04 /* Numeral (digit) */
+#define _SPC 010 /* Spacing character */
+#define _PNT 020 /* Punctuation */
+#define _CTR 040 /* Control character */
#define _B 0100 /* Blank */
#define _X 0200 /* heXadecimal digit */
@@ -111,14 +111,14 @@ extern const char *compiled_charset_name(uint charset_number);
#define isalpha(c) ((my_ctype+1)[(uchar) (c)] & (_U | _L))
#define isupper(c) ((my_ctype+1)[(uchar) (c)] & _U)
#define islower(c) ((my_ctype+1)[(uchar) (c)] & _L)
-#define isdigit(c) ((my_ctype+1)[(uchar) (c)] & _N)
+#define isdigit(c) ((my_ctype+1)[(uchar) (c)] & _NMR)
#define isxdigit(c) ((my_ctype+1)[(uchar) (c)] & _X)
-#define isalnum(c) ((my_ctype+1)[(uchar) (c)] & (_U | _L | _N))
-#define isspace(c) ((my_ctype+1)[(uchar) (c)] & _S)
-#define ispunct(c) ((my_ctype+1)[(uchar) (c)] & _P)
-#define isprint(c) ((my_ctype+1)[(uchar) (c)] & (_P | _U | _L | _N | _B))
-#define isgraph(c) ((my_ctype+1)[(uchar) (c)] & (_P | _U | _L | _N))
-#define iscntrl(c) ((my_ctype+1)[(uchar) (c)] & _C)
+#define isalnum(c) ((my_ctype+1)[(uchar) (c)] & (_U | _L | _NMR))
+#define isspace(c) ((my_ctype+1)[(uchar) (c)] & _SPC)
+#define ispunct(c) ((my_ctype+1)[(uchar) (c)] & _PNT)
+#define isprint(c) ((my_ctype+1)[(uchar) (c)] & (_PNT | _U | _L | _NMR | _B))
+#define isgraph(c) ((my_ctype+1)[(uchar) (c)] & (_PNT | _U | _L | _NMR))
+#define iscntrl(c) ((my_ctype+1)[(uchar) (c)] & _CTR)
#define isascii(c) (!((c) & ~0177))
#define toascii(c) ((c) & 0177)
@@ -129,14 +129,14 @@ extern const char *compiled_charset_name(uint charset_number);
#define my_isalpha(s, c) (((s)->ctype+1)[(uchar) (c)] & (_U | _L))
#define my_isupper(s, c) (((s)->ctype+1)[(uchar) (c)] & _U)
#define my_islower(s, c) (((s)->ctype+1)[(uchar) (c)] & _L)
-#define my_isdigit(s, c) (((s)->ctype+1)[(uchar) (c)] & _N)
+#define my_isdigit(s, c) (((s)->ctype+1)[(uchar) (c)] & _NMR)
#define my_isxdigit(s, c) (((s)->ctype+1)[(uchar) (c)] & _X)
-#define my_isalnum(s, c) (((s)->ctype+1)[(uchar) (c)] & (_U | _L | _N))
-#define my_isspace(s, c) (((s)->ctype+1)[(uchar) (c)] & _S)
-#define my_ispunct(s, c) (((s)->ctype+1)[(uchar) (c)] & _P)
-#define my_isprint(s, c) (((s)->ctype+1)[(uchar) (c)] & (_P | _U | _L | _N | _B))
-#define my_isgraph(s, c) (((s)->ctype+1)[(uchar) (c)] & (_P | _U | _L | _N))
-#define my_iscntrl(s, c) (((s)->ctype+1)[(uchar) (c)] & _C)
+#define my_isalnum(s, c) (((s)->ctype+1)[(uchar) (c)] & (_U | _L | _NMR))
+#define my_isspace(s, c) (((s)->ctype+1)[(uchar) (c)] & _SPC)
+#define my_ispunct(s, c) (((s)->ctype+1)[(uchar) (c)] & _PNT)
+#define my_isprint(s, c) (((s)->ctype+1)[(uchar) (c)] & (_PNT | _U | _L | _NMR | _B))
+#define my_isgraph(s, c) (((s)->ctype+1)[(uchar) (c)] & (_PNT | _U | _L | _NMR))
+#define my_iscntrl(s, c) (((s)->ctype+1)[(uchar) (c)] & _CTR)
#define use_strcoll(s) ((s)->strcoll != NULL)
#define MY_STRXFRM_MULTIPLY (default_charset_info->strxfrm_multiply)
diff --git a/include/my_global.h b/include/my_global.h
index 6a7385e18a2..01476c386c8 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -132,6 +132,14 @@
/* #define _AIX32_CURSES */ /* XXX: this breaks AIX 4.3.3 (others?). */
#endif
+#ifdef __QNXNTO__
+#define HAVE_ERRNO_AS_DEFINE
+#define HAVE_FCNTL_LOCK
+#undef HAVE_SYS_UN_H
+#undef HAVE_FINITE
+#undef HAVE_RINT
+#endif
+
#ifdef HAVE_BROKEN_SNPRINTF /* HPUX 10.20 don't have this defined */
#undef HAVE_SNPRINTF
#endif