summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2012-02-29 19:01:58 +0100
committerMarc-André Lureau <marcandre.lureau@gmail.com>2012-03-20 15:25:56 +0100
commitea9e91cd8dd2ca8a441eaaae951ddffd0bf0a800 (patch)
tree25b39952e44238d623915ebfe5282558f74df109 /common
parenta107b62a745fa1e9755c4c0edd6ede32011eace3 (diff)
mingw: don't try to redefine alloca
mingw already has a #define alloca __builtin_alloca so trying to redefine it triggers a warning.
Diffstat (limited to 'common')
-rw-r--r--common/mem.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/mem.h b/common/mem.h
index 980ea13..af89ba6 100644
--- a/common/mem.h
+++ b/common/mem.h
@@ -41,7 +41,9 @@ extern "C" {
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
+#if !defined alloca
# define alloca __builtin_alloca
+#endif
#elif defined _AIX
# define alloca __alloca
#elif defined _MSC_VER