summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-08-30 18:19:34 +0300
committerunknown <monty@donna.mysql.com>2000-08-30 18:19:34 +0300
commit45c60b2c6a71bf44e802a71be3feaed67546f2e3 (patch)
tree4717082f93fe4ff841c6bc82dfa613ee64625ca1 /include
parent1f340779b08777e73876d5f790c304c8b959fb85 (diff)
downloadmariadb-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
Diffstat (limited to 'include')
-rw-r--r--include/global.h2
1 files changed, 1 insertions, 1 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