[gupnp] Remove GLIB_CHECK_VERSION <= 2.40



commit 3d38f2fc63c9df9f8c562651b460d4cc6abc0af4
Author: Jens Georg <mail jensge org>
Date:   Sat Nov 28 19:49:18 2015 +0100

    Remove GLIB_CHECK_VERSION <= 2.40
    
    We require 2.40 by the build, so the macros are not needed anymore.
    
    Signed-off-by: Jens Georg <mail jensge org>

 examples/light-client.c    |    4 ----
 examples/light-server.c    |    4 ----
 libgupnp/gvalue-util.c     |    8 --------
 tests/gtest/test-bugs.c    |    3 ---
 tests/gtest/test-context.c |    3 ---
 tests/test-browsing.c      |    3 ---
 tests/test-introspection.c |    3 ---
 tests/test-proxy.c         |    3 ---
 tests/test-server.c        |    3 ---
 tests/test-white-list.c    |    3 ---
 10 files changed, 0 insertions(+), 37 deletions(-)
---
diff --git a/examples/light-client.c b/examples/light-client.c
index cdb9aab..9fa31fa 100644
--- a/examples/light-client.c
+++ b/examples/light-client.c
@@ -120,10 +120,6 @@ main (int argc, char **argv)
   GUPnPContext *context;
   GUPnPControlPoint *cp;
 
-#if !GLIB_CHECK_VERSION(2,35,0)
-  g_type_init ();
-#endif
-
   optionContext = g_option_context_new ("[on|off|toggle]");
   g_option_context_add_main_entries (optionContext, entries, NULL);
   if (!g_option_context_parse (optionContext, &argc, &argv, &error))
diff --git a/examples/light-server.c b/examples/light-server.c
index f1b7162..c68874e 100644
--- a/examples/light-server.c
+++ b/examples/light-server.c
@@ -133,10 +133,6 @@ main (G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv)
   GUPnPRootDevice *dev;
   GUPnPServiceInfo *service;
   
-#if !GLIB_CHECK_VERSION(2,35,0)
-  g_type_init ();
-#endif
-
   optionContext = g_option_context_new (NULL);
   g_option_context_add_main_entries (optionContext, entries, NULL);
   if (!g_option_context_parse (optionContext, &argc, &argv, &error))
diff --git a/libgupnp/gvalue-util.c b/libgupnp/gvalue-util.c
index b01d2f9..c5a2912 100644
--- a/libgupnp/gvalue-util.c
+++ b/libgupnp/gvalue-util.c
@@ -42,11 +42,7 @@ gvalue_util_set_value_from_string (GValue     *value,
                 break;
 
         case G_TYPE_CHAR:
-#if GLIB_CHECK_VERSION(2,32,0)
                 g_value_set_schar (value, *str);
-#else
-                g_value_set_char (value, *str);
-#endif
 
                 break;
 
@@ -179,11 +175,7 @@ gvalue_util_value_append_to_xml_string (const GValue *value,
                 return TRUE;
 
         case G_TYPE_CHAR:
-#if GLIB_CHECK_VERSION(2,32,0)
                 g_string_append_c (str, g_value_get_schar (value));
-#else
-                g_string_append_c (str, g_value_get_char (value));
-#endif
 
                 return TRUE;
 
diff --git a/tests/gtest/test-bugs.c b/tests/gtest/test-bugs.c
index 8578c26..27f6129 100644
--- a/tests/gtest/test-bugs.c
+++ b/tests/gtest/test-bugs.c
@@ -443,9 +443,6 @@ test_bgo_722696 (void)
 
 int
 main (int argc, char *argv[]) {
-#if !GLIB_CHECK_VERSION(2,35,0)
-    g_type_init ();
-#endif
     g_test_init (&argc, &argv, NULL);
     g_test_add_func ("/bugs/696762", test_bgo_696762);
     g_test_add_func ("/bugs/678701", test_bgo_678701);
diff --git a/tests/gtest/test-context.c b/tests/gtest/test-context.c
index 0bfda7c..93dc283 100644
--- a/tests/gtest/test-context.c
+++ b/tests/gtest/test-context.c
@@ -207,9 +207,6 @@ test_gupnp_context_http_ranged_requests (void)
 }
 
 int main (int argc, char *argv[]) {
-#if !GLIB_CHECK_VERSION(2,35,0)
-        g_type_init ();
-#endif
         g_test_init (&argc, &argv, NULL);
         g_test_add_func ("/context/http/ranged-requests",
                          test_gupnp_context_http_ranged_requests);
diff --git a/tests/test-browsing.c b/tests/test-browsing.c
index d052f82..89b6169 100644
--- a/tests/test-browsing.c
+++ b/tests/test-browsing.c
@@ -100,9 +100,6 @@ main (G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv)
         struct sigaction sig_action;
 #endif /* G_OS_WIN32 */
 
-#if !GLIB_CHECK_VERSION(2,35,0)
-        g_type_init ();
-#endif
         setlocale (LC_ALL, "");
 
         error = NULL;
diff --git a/tests/test-introspection.c b/tests/test-introspection.c
index 6d56ed5..505f51d 100644
--- a/tests/test-introspection.c
+++ b/tests/test-introspection.c
@@ -265,9 +265,6 @@ main (int argc, char **argv)
                 return EXIT_FAILURE;
         }
                
-#if !GLIB_CHECK_VERSION(2,35,0)
-        g_type_init ();
-#endif
 
         error = NULL;
         context = g_initable_new (GUPNP_TYPE_CONTEXT, NULL, &error, NULL);
diff --git a/tests/test-proxy.c b/tests/test-proxy.c
index 47ff0d2..6eeb1dc 100644
--- a/tests/test-proxy.c
+++ b/tests/test-proxy.c
@@ -156,9 +156,6 @@ main (G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv)
         struct sigaction sig_action;
 #endif /* G_OS_WIN32 */
 
-#if !GLIB_CHECK_VERSION(2,35,0)
-        g_type_init ();
-#endif
         setlocale (LC_ALL, "");
 
         error = NULL;
diff --git a/tests/test-server.c b/tests/test-server.c
index 095170b..3f9461a 100644
--- a/tests/test-server.c
+++ b/tests/test-server.c
@@ -72,9 +72,6 @@ main (int argc, char **argv)
                 return EXIT_FAILURE;
         }
 
-#if !GLIB_CHECK_VERSION(2,35,0)
-        g_type_init ();
-#endif
         setlocale (LC_ALL, "");
 
         error = NULL;
diff --git a/tests/test-white-list.c b/tests/test-white-list.c
index 465ac72..037ca1c 100644
--- a/tests/test-white-list.c
+++ b/tests/test-white-list.c
@@ -250,9 +250,6 @@ main (G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv)
         struct sigaction sig_action;
 #endif /* G_OS_WIN32 */
 
-#if !GLIB_CHECK_VERSION(2,35,0)
-        g_type_init ();
-#endif
         setlocale (LC_ALL, "");
 
         cm = gupnp_context_manager_create(0);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]