[json-glib] Bump up the GLib dependency

[Emmanuele Bassi <ebassi src gnome org>]

commit 2cb5836b99fd4f03e88568de492d1a12841c4176
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Mon Oct 17 11:06:38 2011 +0100

    Bump up the GLib dependency
    
    It's the development cycle, we can start using GLib 2.31.

 configure.ac           |    2 +-
 json-glib/json-types.h |    6 ------
 2 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a25ecfa..ec9a79d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ m4_define([lt_current], [m4_eval(100 * json_minor_version + json_micro_version -
 m4_define([lt_revision], [json_interface_age])
 m4_define([lt_age], [m4_eval(json_binary_age - json_interface_age)])
 
-m4_define([glib_req_version], [2.26])
+m4_define([glib_req_version], [2.31.0])
 
 AC_PREREQ([2.63])
 
diff --git a/json-glib/json-types.h b/json-glib/json-types.h
index 8bb583b..709faf5 100644
--- a/json-glib/json-types.h
+++ b/json-glib/json-types.h
@@ -32,12 +32,6 @@
 
 G_BEGIN_DECLS
 
-/* guards to avoid bumping up the GLib dependency */
-#ifndef G_DEPRECATED
-#define G_DEPRECATED            G_GNUC_DEPRECATED
-#define G_DEPRECATED_FOR(x)     G_GNUC_DEPRECATED_FOR(x)
-#endif
-
 #ifdef JSON_DISABLE_DEPRECATION_WARNINGS
 #define JSON_DEPRECATED
 #define JSON_DEPRECATED_FOR(x)