Portability fix

9f04e0e6 · monty@hundin.mysql.fi · 2350609b · 9f04e0e6 · 9f04e0e6 · 9f04e0e6
Commit 9f04e0e6 authored Sep 30, 2001 by monty@hundin.mysql.fi
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

acinclude.m4 acinclude.m4 +2 -1

client/mysql.cc client/mysql.cc +0 -1

readline/rlstdc.h readline/rlstdc.h +4 -0

strings/Makefile.am strings/Makefile.am +1 -1

No files found.
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -767,7 +767,8 @@ dnl get substituted.

 AC_DEFUN(MYSQL_CHECK_ORBIT, [
 AC_MSG_CHECKING(for ORBit)
-if test `which orbit-config`
+orbit_config_path=`which orbit-config`
+if test -n "$orbit_config_path"
 then
  orbit_exec_prefix=`orbit-config --exec-prefix`
  orbit_includes=`orbit-config --cflags server`

--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -75,7 +75,6 @@ extern "C" {
 #endif

 #undef bcmp				// Fix problem with new readline
-#undef bzero
 #if defined( __WIN__) || defined(OS2)
 #include <conio.h>
 #else

--- a/readline/rlstdc.h
+++ b/readline/rlstdc.h
@@ -76,4 +76,8 @@

 #endif /* !__STDC__ */

+#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__)  || __GNUC__ == 2 && __GNUC_MINOR__ < 8)
+#define __attribute__(A)
+#endif
+
 #endif /* !_RL_STDC_H_ */
--- a/strings/Makefile.am
+++ b/strings/Makefile.am
@@ -43,7 +43,7 @@ noinst_PROGRAMS = conf_to_src
 # Default charset definitions
 EXTRA_DIST =		ctype-big5.c ctype-czech.c ctype-euc_kr.c \
                        ctype-gb2312.c ctype-gbk.c ctype-sjis.c \
-                        ctype-tis620.c ctype-ujis.c \
+                        ctype-tis620.c ctype-ujis.c ctype-latin1_de.c \
                        ctype_autoconf.c \
                        strto.c strings-x86.s longlong2str-x86.s \
 			strxmov.c bmove_upp.c strappend.c strcont.c strend.c \