summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorlenz@mysql.com <>2002-07-03 18:45:38 +0200
committerlenz@mysql.com <>2002-07-03 18:45:38 +0200
commit04888e4675f216b1a8bbdbdd8941404329bba50e (patch)
tree65a935ba87804f544829b381550784cca307e304 /include
parent26f4536f7ebc9916c281ea531e9614d684ddf959 (diff)
downloadmariadb-git-04888e4675f216b1a8bbdbdd8941404329bba50e.tar.gz
Added a compile fix for AIX to include/my_sys.h
Corrected some comments that were using C++-style instead of C-style
Diffstat (limited to 'include')
-rw-r--r--include/my_sys.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index 0b191c17173..664131e8187 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -159,6 +159,13 @@ extern my_string my_strdup(const char *from,myf MyFlags);
#define ORIG_CALLER_INFO /* nothing */
#endif
#ifdef HAVE_ALLOCA
+#ifdef __GNUC__
+/* Remove any previous definitions. */
+#undef alloca
+#define alloca(size) __builtin_alloca (size)
+#else /* xlc */
+ #pragma alloca
+#endif /* GCC. */
#define my_alloca(SZ) alloca((size_t) (SZ))
#define my_afree(PTR) {}
#else