Silence some uncontroversial warnings

https://bugzilla.gnome.org/show_bug.cgi?id=711547

diff --git a/gio/gresolver.c b/gio/gresolver.c
index 7c69d1a..e73ef0e 100644 (file)
--- a/gio/gresolver.c
+++ b/gio/gresolver.c
@@ -294,7 +294,9 @@ handle_ip_address (const char  *hostname,
                    GError     **error)
 {
   GInetAddress *addr;
+#ifndef G_OS_WIN32
   struct in_addr ip4addr;
+#endif
 
   addr = g_inet_address_new_from_string (hostname);
   if (addr)

diff --git a/glib/gmain.c b/glib/gmain.c
index 45ed402..b68b65c 100644 (file)
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -4012,6 +4012,7 @@ g_main_context_poll (GMainContext *context,
   if (n_fds || timeout != 0)
     {
 #ifdef G_MAIN_POLL_DEBUG
+      poll_timer = NULL;
       if (_g_main_poll_debug)
        {
          g_print ("polling context=%p n=%d timeout=%d\n",

diff --git a/glib/gutils.c b/glib/gutils.c
index e89f028..8fd045a 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -1796,7 +1796,8 @@ g_win32_get_system_data_dirs_for_module (void (*address_of_function)(void))
   gchar **retval;
   gchar *p;
   gchar *exe_root;
-      
+
+  hmodule = NULL;
   if (address_of_function)
     {
       G_LOCK (g_utils_global);