summaryrefslogtreecommitdiff
path: root/include/my_sys.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2003-12-16 13:20:17 +0200
committermonty@mysql.com <>2003-12-16 13:20:17 +0200
commit56f0abf7bb88c98adc4e65de032f63f40498b834 (patch)
tree7caf9e264c5defe6995ae178452a829c4064f97c /include/my_sys.h
parent217226f9afcefb7918ce0aee5ac920dfdf73edf0 (diff)
downloadmariadb-git-56f0abf7bb88c98adc4e65de032f63f40498b834.tar.gz
Portability fixes (mostly test suite)
Make ENGINE= an alias for TYPE= (Compabiltiy with 4.1) Fix when using symlinked data files and realpath() is not working
Diffstat (limited to 'include/my_sys.h')
-rw-r--r--include/my_sys.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index acb4c01b4f1..e1656cfc626 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -167,7 +167,7 @@ extern char *my_strdup_with_length(const byte *from, uint length,
#if defined(_AIX) && !defined(__GNUC__)
#pragma alloca
#endif /* _AIX */
-#if defined(__GNUC__) && !defined(HAVE_ALLOCA_H)
+#if defined(__GNUC__) && !defined(HAVE_ALLOCA_H) && ! defined(alloca)
#define alloca __builtin_alloca
#endif /* GNUC */
#define my_alloca(SZ) alloca((size_t) (SZ))