diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-30 18:35:08 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-30 18:35:08 +0300 |
| commit | 3dbd178881d1d4c0fc7ee878c0fb6dab1fc5b10d (patch) | |
| tree | c936b3bff99bce5c6c2c3b58a12d46356a9aac54 | |
| parent | 87a0cc9419ef4dc84750a236c90c22f8f2edcc00 (diff) | |
| download | mariadb-git-3dbd178881d1d4c0fc7ee878c0fb6dab1fc5b10d.tar.gz | |
Portability fix
strings/Makefile.am:
Add missing ctype-latin1_de.cc
| -rw-r--r-- | acinclude.m4 | 3 | ||||
| -rw-r--r-- | client/mysql.cc | 1 | ||||
| -rw-r--r-- | readline/rlstdc.h | 4 | ||||
| -rw-r--r-- | strings/Makefile.am | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 1535f0df5f7..b7f43fcb8e6 100644 --- 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` diff --git a/client/mysql.cc b/client/mysql.cc index dbaff8e57f5..06b76ac81e9 100644 --- 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 diff --git a/readline/rlstdc.h b/readline/rlstdc.h index d2c5f874d7a..f79cf89fe76 100644 --- 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_ */ diff --git a/strings/Makefile.am b/strings/Makefile.am index 6bf21d630f3..d198318a0f8 100644 --- 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 \ |