Author: cazfi
Date: Fri Feb 20 01:37:11 2015
New Revision: 28226
URL: http://svn.gna.org/viewcvs/freeciv?rev=28226&view=rev
Log:
Enabled warnings about deprecated declarations. Use glib and gtk macro magic to
control what is considered deprecated, and also what functions are considered
too recent
additions to be used in freeciv code.
See patch #5810
Modified:
trunk/m4/debug.m4
trunk/m4/gtk-2.0.m4
trunk/m4/gtk-3.0.m4
Modified: trunk/m4/debug.m4
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/m4/debug.m4?rev=28226&r1=28225&r2=28226&view=diff
==============================================================================
--- trunk/m4/debug.m4 (original)
+++ trunk/m4/debug.m4 Fri Feb 20 01:37:11 2015
@@ -42,12 +42,12 @@
AC_DEFINE([LUA_USE_APICHECK], [1], [Lua Api checks])
FC_C_FLAGS([-Werror -Wmissing-prototypes -Wmissing-declarations \
- -Wformat -Wformat-security -Wnested-externs
-Wno-deprecated-declarations \
+ -Wformat -Wformat-security -Wnested-externs \
-Wno-tautological-compare],
[], [EXTRA_DEBUG_CFLAGS])
if test "x$cxx_works" = "xyes" ; then
FC_CXX_FLAGS([-Werror -Wmissing-prototypes -Wmissing-declarations \
- -Wformat -Wformat-security -Wno-deprecated-declarations \
+ -Wformat -Wformat-security \
-Wno-tautological-compare],
[], [EXTRA_DEBUG_CXXFLAGS])
fi
Modified: trunk/m4/gtk-2.0.m4
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk-2.0.m4?rev=28226&r1=28225&r2=28226&view=diff
==============================================================================
--- trunk/m4/gtk-2.0.m4 (original)
+++ trunk/m4/gtk-2.0.m4 Fri Feb 20 01:37:11 2015
@@ -58,6 +58,8 @@
if test x"$no_gtk" = x ; then
GTK2_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+ GTK2_CFLAGS="$GTK2_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_2_12
-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_2_12"
+ GTK2_CFLAGS="$GTK2_CFLAGS -DGLIB_DISABLE_DEPRECATION_WARNINGS"
GTK2_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
Modified: trunk/m4/gtk-3.0.m4
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk-3.0.m4?rev=28226&r1=28225&r2=28226&view=diff
==============================================================================
--- trunk/m4/gtk-3.0.m4 (original)
+++ trunk/m4/gtk-3.0.m4 Fri Feb 20 01:37:11 2015
@@ -58,6 +58,8 @@
if test x"$no_gtk" = x ; then
GTK3_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+ GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_8
-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_8"
+ GTK3_CFLAGS="$GTK3_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36
-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36"
GTK3_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
