summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/my_global.h')
-rw-r--r--include/my_global.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 1e1821e2f25..8cf06ddcb1e 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -358,13 +358,6 @@ C_MODE_END
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA)
-#undef HAVE_ALLOCA
-#undef HAVE_ALLOCA_H
-#endif
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
#include <errno.h> /* Recommended by debian */
/* We need the following to go around a problem with openssl on solaris */
@@ -521,6 +514,7 @@ typedef unsigned short ushort;
#endif
#include <my_compiler.h>
+#include <my_alloca.h>
/*
Wen using the embedded library, users might run into link problems,