projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merged (and removed Malloc for size_t in mget)
[m6w6/libmemcached]
/
m4
/
pandora_warnings.m4
diff --git
a/m4/pandora_warnings.m4
b/m4/pandora_warnings.m4
index 2af759a401bc86423df07510ee57b70602f7e6f5..81795a5c692869c20cea5003843050fe77cbf55c 100644
(file)
--- a/
m4/pandora_warnings.m4
+++ b/
m4/pandora_warnings.m4
@@
-13,7
+13,9
@@
dnl allow it
AC_DEFUN([PANDORA_WARNINGS],[
m4_define([PW_LESS_WARNINGS],[no])
m4_define([PW_WARN_ALWAYS_ON],[no])
AC_DEFUN([PANDORA_WARNINGS],[
m4_define([PW_LESS_WARNINGS],[no])
m4_define([PW_WARN_ALWAYS_ON],[no])
- m4_foreach_w([pw_arg],$@,[
+ ifdef([m4_define],,[define([m4_define], defn([define]))])
+ ifdef([m4_undefine],,[define([m4_undefine], defn([undefine]))])
+ m4_foreach([pw_arg],[$*],[
m4_case(pw_arg,
[less-warnings],[
m4_undefine([PW_LESS_WARNINGS])
m4_case(pw_arg,
[less-warnings],[
m4_undefine([PW_LESS_WARNINGS])
@@
-67,7
+69,7
@@
AC_DEFUN([PANDORA_WARNINGS],[
AC_CACHE_CHECK([whether it is safe to use -fdiagnostics-show-option],
[ac_cv_safe_to_use_fdiagnostics_show_option_],
[save_CFLAGS="$CFLAGS"
AC_CACHE_CHECK([whether it is safe to use -fdiagnostics-show-option],
[ac_cv_safe_to_use_fdiagnostics_show_option_],
[save_CFLAGS="$CFLAGS"
- CFLAGS="-fdiagnostics-show-option ${AM_CFLAGS}"
+ CFLAGS="-fdiagnostics-show-option ${AM_CFLAGS}
${CFLAGS}
"
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([],[])],
[ac_cv_safe_to_use_fdiagnostics_show_option_=yes],
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([],[])],
[ac_cv_safe_to_use_fdiagnostics_show_option_=yes],
@@
-84,7
+86,7
@@
AC_DEFUN([PANDORA_WARNINGS],[
[save_CFLAGS="$CFLAGS"
dnl Use -Werror here instead of ${W_FAIL} so that we don't spew
dnl conversion warnings to all the tarball folks
[save_CFLAGS="$CFLAGS"
dnl Use -Werror here instead of ${W_FAIL} so that we don't spew
dnl conversion warnings to all the tarball folks
- CFLAGS="-Wconversion -Werror -pedantic ${AM_CFLAGS}"
+ CFLAGS="-Wconversion -Werror -pedantic ${AM_CFLAGS}
${CFLAGS}
"
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[
#include <stdbool.h>
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[
#include <stdbool.h>
@@
-106,7
+108,7
@@
foo(0);
[save_CFLAGS="$CFLAGS"
dnl Use -Werror here instead of ${W_FAIL} so that we don't spew
dnl conversion warnings to all the tarball folks
[save_CFLAGS="$CFLAGS"
dnl Use -Werror here instead of ${W_FAIL} so that we don't spew
dnl conversion warnings to all the tarball folks
- CFLAGS="-Wconversion -Werror -pedantic ${AM_CFLAGS}"
+ CFLAGS="-Wconversion -Werror -pedantic ${AM_CFLAGS}
${CFLAGS}
"
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[
@@
-127,13
+129,16
@@
uint16_t x= htons(80);
m4_if(PW_LESS_WARNINGS,[no],[
BASE_WARNINGS_FULL="-Wformat=2 ${W_CONVERSION} -Wstrict-aliasing"
m4_if(PW_LESS_WARNINGS,[no],[
BASE_WARNINGS_FULL="-Wformat=2 ${W_CONVERSION} -Wstrict-aliasing"
- CC_WARNINGS_FULL="-Wswitch-default -Wswitch-enum"
+ CC_WARNINGS_FULL="-Wswitch-default -Wswitch-enum
-Wwrite-strings
"
CXX_WARNINGS_FULL="-Weffc++ -Wold-style-cast"
],[
BASE_WARNINGS_FULL="-Wformat ${NO_STRICT_ALIASING}"
])
CXX_WARNINGS_FULL="-Weffc++ -Wold-style-cast"
],[
BASE_WARNINGS_FULL="-Wformat ${NO_STRICT_ALIASING}"
])
- BASE_WARNINGS="${W_FAIL} -pedantic -Wall -Wextra -Wundef -Wshadow -Wstrict-aliasing ${F_DIAGNOSTICS_SHOW_OPTION} ${CFLAG_VISIBILITY} ${BASE_WARNINGS_FULL}"
+ AS_IF([test "${ac_cv_assert}" = "no"],
+ [NO_UNUSED="-Wno-unused-variable -Wno-unused-parameter"])
+
+ BASE_WARNINGS="${W_FAIL} -pedantic -Wall -Wextra -Wundef -Wshadow ${NO_UNUSED} ${F_DIAGNOSTICS_SHOW_OPTION} ${CFLAG_VISIBILITY} ${BASE_WARNINGS_FULL}"
CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}"
CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}"
CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}"
CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}"
@@
-159,7
+164,7
@@
uint16_t x= htons(80);
AC_CACHE_CHECK([whether it is safe to use -Wlogical-op],
[ac_cv_safe_to_use_Wlogical_op_],
[save_CFLAGS="$CFLAGS"
AC_CACHE_CHECK([whether it is safe to use -Wlogical-op],
[ac_cv_safe_to_use_Wlogical_op_],
[save_CFLAGS="$CFLAGS"
- CFLAGS="${W_FAIL} -pedantic -Wlogical-op ${AM_CFLAGS}"
+ CFLAGS="${W_FAIL} -pedantic -Wlogical-op ${AM_CFLAGS}
${CFLAGS}
"
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM(
[[
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM(
[[