=== modified file 'configure.ac' --- configure.ac 2014-03-20 20:49:46 +0000 +++ configure.ac 2014-03-22 11:22:16 +0000 @@ -96,7 +96,31 @@ # Test for -Werror=... (introduced some time post-4.0) AC_MSG_CHECKING([compiler support for -Werror=...]) ink_svd_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-Werror=format-security -Werror=switch -Werror=return-type $CPPFLAGS" + ink_werror_CPPFLAGS="-Wno-error=unused-function" # src/util/units.cpp:53 + ink_werror_CPPFLAGS="-Wno-error=return-type $ink_werror_CPPFLAGS" # src/ui/tool/node.cpp:1220 + ink_werror_CPPFLAGS="-Wno-error=gnu $ink_werror_CPPFLAGS" # src/display/nr-filter-turbulence.cpp:291 + ink_werror_CPPFLAGS="-Wno-error=mismatched-tags $ink_werror_CPPFLAGS" # $PREFIX/include/gtkmm-2.4/gtkmm/papersize.h:290 + ink_werror_CPPFLAGS="-Wno-error=deprecated-declarations $ink_werror_CPPFLAGS" # src/gc.cpp:31 + ink_werror_CPPFLAGS="-Wno-error=uninitialized $ink_werror_CPPFLAGS" # src/libuemf/upmf.c:3096 + ink_werror_CPPFLAGS="-Wno-error=self-assign $ink_werror_CPPFLAGS" # src/libuemf/uemf_endian.c:428 + ink_werror_CPPFLAGS="-Wno-error=parentheses-equality $ink_werror_CPPFLAGS" # src/libcroco/cr-parser.c:2433 + ink_werror_CPPFLAGS="-Wno-error=tautological-compare $ink_werror_CPPFLAGS" # $PREFIX/include/lcms.h:1418 + ink_werror_CPPFLAGS="-Wno-error=cast-align $ink_werror_CPPFLAGS" # plenty of warnings from inkscape with clang + ink_werror_CPPFLAGS="-Wno-error=format-extra-args $ink_werror_CPPFLAGS" + ink_werror_CPPFLAGS="-Wno-error=format $ink_werror_CPPFLAGS" + ink_werror_CPPFLAGS="-Wno-error=write-strings $ink_werror_CPPFLAGS" + ink_werror_CPPFLAGS="-Wno-error=strict-overflow $ink_werror_CPPFLAGS" + ink_werror_CPPFLAGS="-Wno-error=unused-but-set-variable $ink_werror_CPPFLAGS" + ink_werror_CPPFLAGS="-Wno-error=unused-parameter $ink_werror_CPPFLAGS" + ink_werror_CPPFLAGS="-Wno-error=pointer-sign $ink_werror_CPPFLAGS" + ink_werror_CPPFLAGS="-Werror $ink_werror_CPPFLAGS" + ink_werror_CPPFLAGS="-Werror=format-security $ink_werror_CPPFLAGS" + ink_werror_CPPFLAGS="-Werror=switch $ink_werror_CPPFLAGS" + ink_werror_CPPFLAGS="-Werror=return-type $ink_werror_CPPFLAGS" + ink_werror_CPPFLAGS="-Wsign-compare $ink_werror_CPPFLAGS" # was set later for CXXFLAGS (line 1034) + ink_werror_CPPFLAGS="-Wcast-align $ink_werror_CPPFLAGS" # was set later for CXXFLAGS (line 1034) + ink_werror_CPPFLAGS="-Wpointer-arith $ink_werror_CPPFLAGS" # was set later for CXXFLAGS (line 1034) + CPPFLAGS="$CPPFLAGS $ink_werror_CPPFLAGS" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [ink_opt_ok=yes], [ink_opt_ok=no]) AC_MSG_RESULT([$ink_opt_ok]) if test "x$ink_opt_ok" != "xyes"; then @@ -982,14 +1006,6 @@ AC_STRUCT_TM AC_TYPE_MODE_T -dnl Work around broken gcc 3.3 (seen on OSX) where "ENABLE_NLS" isn't -dnl set correctly because the gettext function isn't noticed. -if test "$ac_cv_header_libintl_h" = "yes" && - test "$ac_cv_func_bind_textdomain_codeset" = "yes" && - test "$gt_cv_func_have_gettext" != "yes"; then - AC_DEFINE([ENABLE_NLS], [], [Description]) -fi - dnl ****************************** dnl Compilation warnings dnl ****************************** @@ -1015,7 +1031,7 @@ # as a callback or similar function pointer use). # Add even more stuff - CXXFLAGS="-Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch $CXXFLAGS" + CXXFLAGS="-Woverloaded-virtual $CXXFLAGS" fi === modified file 'src/display/drawing-item.h' --- src/display/drawing-item.h 2014-03-13 22:37:07 +0000 +++ src/display/drawing-item.h 2014-03-22 10:52:03 +0000 @@ -16,7 +16,24 @@ #include #include #include + +// suppress excessive cast-lign warnings with clang +#if defined __GNUC__ +#pragma GCC system_header +#elif defined __SUNPRO_CC +#pragma disable_warn +#elif defined _MSC_VER +#pragma warning(push, 1) +#endif + #include + +#if defined __SUNPRO_CC +#pragma enable_warn +#elif defined _MSC_VER +#pragma warning(pop) +#endif + #include <2geom/rect.h> #include <2geom/affine.h>