summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-09-24 10:03:17 -0300
committerDavi Arnaut <davi.arnaut@oracle.com>2010-09-24 10:03:17 -0300
commit5c09a44d88de151bca34b2df9785e8e06b00f60c (patch)
tree9eb89cafd3630a30b536d169a249e8e5ad05b1a1 /config
parent17181807669b3e77facdfa41f89ddd84192edb18 (diff)
parent930a50f9d3709fb18c30a1c4d4f1b9908d53ed1f (diff)
downloadmariadb-git-5c09a44d88de151bca34b2df9785e8e06b00f60c.tar.gz
Merge of mysql-5.1-bugteam into mysql-5.5-merge.
Diffstat (limited to 'config')
-rw-r--r--config/ac-macros/maintainer.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/config/ac-macros/maintainer.m4 b/config/ac-macros/maintainer.m4
index 1b7df75d6f7..24be31395f2 100644
--- a/config/ac-macros/maintainer.m4
+++ b/config/ac-macros/maintainer.m4
@@ -16,7 +16,7 @@ AC_DEFUN([MY_MAINTAINER_MODE], [
AC_DEFUN([MY_MAINTAINER_MODE_WARNINGS], [
# Setup GCC warning options.
AS_IF([test "$GCC" = "yes"], [
- C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Werror"
+ C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror"
CXX_WARNINGS="${C_WARNINGS} -Wno-unused-parameter"
])