summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorРуслан Ижбулатов <lrn1986@gmail.com>2014-08-02 12:35:43 +0000
committerРуслан Ижбулатов <lrn1986@gmail.com>2014-08-02 12:38:38 +0000
commit42ddcc6ff22c66f1ded9d7a3879df39988531878 (patch)
tree5216f4a8608830b2b5e80b31b1997ff3cf2c06d8
parent40650e33239994237917322d4cfecc34e4cc4394 (diff)
Silence some uncontroversial warnings
https://bugzilla.gnome.org/show_bug.cgi?id=711547
-rw-r--r--gio/gresolver.c2
-rw-r--r--glib/gmain.c1
-rw-r--r--glib/gutils.c3
3 files changed, 5 insertions, 1 deletions
diff --git a/gio/gresolver.c b/gio/gresolver.c
index 7c69d1a90..e73ef0e9f 100644
--- 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 45ed40250..b68b65c71 100644
--- 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 e89f0283c..8fd045a9f 100644
--- 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);