Skip to content

M
mariadb
Commit 74ebbd6c authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files
Options

Fixes to get 3.23.23 to compile

parent 88e811a1
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
include/global.h
View file @ 74ebbd6c
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
#endif #endif
/* In Linux-ia64 including atomic.h will give us an error */ /* 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_ADD
#undef HAVE_ATOMIC_SUB #undef HAVE_ATOMIC_SUB
#endif #endif
......
strings/Makefile.am
View file @ 74ebbd6c
...@@ -64,9 +64,7 @@ OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ ...@@ -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 cdefs.h machdep.h signal.h __signal.h util.h
libmystrings_a_LIBADD= @CHARSET_OBJS@ libmystrings_a_LIBADD= @CHARSET_OBJS@
ctype.c: ctype_extra_sources.c ctype.o: ctype_extra_sources.c
#we need a dummy rule to make GNUMake get along with bitkeeper
echo '' >/dev/null
ctype_extra_sources.c: conf_to_src ctype_extra_sources.c: conf_to_src
./conf_to_src $(top_srcdir) @CHARSETS_NEED_SOURCE@ > \ ./conf_to_src $(top_srcdir) @CHARSETS_NEED_SOURCE@ > \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7