diff options
| author | unknown <monty@donna.mysql.com> | 2000-08-30 18:19:34 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-08-30 18:19:34 +0300 |
| commit | 45c60b2c6a71bf44e802a71be3feaed67546f2e3 (patch) | |
| tree | 4717082f93fe4ff841c6bc82dfa613ee64625ca1 | |
| parent | 1f340779b08777e73876d5f790c304c8b959fb85 (diff) | |
| download | mariadb-git-45c60b2c6a71bf44e802a71be3feaed67546f2e3.tar.gz | |
Fixes to get 3.23.23 to compile
include/global.h:
Fix for Ia64
strings/Makefile.am:
Fix to get dist to compile
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | strings/Makefile.am | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/global.h b/include/global.h index 6ad6b068b98..57b4c07b045 100644 --- a/include/global.h +++ b/include/global.h @@ -116,7 +116,7 @@ #endif /* In Linux-ia64 including atomic.h will give us an error */ -#if defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && defined(__ia64__) +#if (defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && defined(__ia64__)) || !defined(THREAD) #undef HAVE_ATOMIC_ADD #undef HAVE_ATOMIC_SUB #endif diff --git a/strings/Makefile.am b/strings/Makefile.am index fac662b8789..658ea8a2a6d 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -64,9 +64,7 @@ OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ cdefs.h machdep.h signal.h __signal.h util.h libmystrings_a_LIBADD= @CHARSET_OBJS@ -ctype.c: ctype_extra_sources.c -#we need a dummy rule to make GNUMake get along with bitkeeper - echo '' >/dev/null +ctype.o: ctype_extra_sources.c ctype_extra_sources.c: conf_to_src ./conf_to_src $(top_srcdir) @CHARSETS_NEED_SOURCE@ > \ |