From 309325949f85a648488a9c54c9f69e2df7fc60dc Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 20 Aug 2009 15:45:03 +0100 Subject: Uncomment enough warnings so master actually compiles... --- configure.ac | 4 ++-- src/dkp-input.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index d3bc8b6..0bfde4c 100644 --- a/configure.ac +++ b/configure.ac @@ -97,7 +97,7 @@ if test "$GCC" = "yes"; then WARNINGFLAGS_C="$WARNINGFLAGS_C -Wall" WARNINGFLAGS_C="$WARNINGFLAGS_C -Wcast-align -Wno-uninitialized" WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-declarations" - WARNINGFLAGS_C="$WARNINGFLAGS_C -Wredundant-decls" +# WARNINGFLAGS_C="$WARNINGFLAGS_C -Wredundant-decls" WARNINGFLAGS_C="$WARNINGFLAGS_C -Wpointer-arith" WARNINGFLAGS_C="$WARNINGFLAGS_C -Wcast-align" WARNINGFLAGS_C="$WARNINGFLAGS_C -Wwrite-strings" @@ -115,7 +115,7 @@ if test "$GCC" = "yes"; then WARNINGFLAGS_C="$WARNINGFLAGS_C -Wuninitialized" WARNINGFLAGS_C="$WARNINGFLAGS_C -Waggregate-return" WARNINGFLAGS_C="$WARNINGFLAGS_C -Wdeclaration-after-statement" - WARNINGFLAGS_C="$WARNINGFLAGS_C -Wshadow" +# WARNINGFLAGS_C="$WARNINGFLAGS_C -Wshadow" WARNINGFLAGS_C="$WARNINGFLAGS_C -Wno-strict-aliasing" # WARNINGFLAGS_C="$WARNINGFLAGS_C -Winline" # WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-parameter-type" diff --git a/src/dkp-input.c b/src/dkp-input.c index 76f66ba..59b4cf4 100644 --- a/src/dkp-input.c +++ b/src/dkp-input.c @@ -244,14 +244,14 @@ dkp_input_coldplug (DkpInput *input, DkpDaemon *daemon, GUdevDevice *d) } /* save daemon */ - input->priv->daemon = g_object_ref (daemon_); + input->priv->daemon = g_object_ref (daemon); /* watch this */ g_io_add_watch (input->priv->channel, G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL, dkp_input_event_io, input); /* set if we are closed */ egg_debug ("using %s for lid event", native_path); - dkp_daemon_set_lid_is_closed (daemon_, test_bit (SW_LID, bitmask), FALSE); + dkp_daemon_set_lid_is_closed (daemon, test_bit (SW_LID, bitmask), FALSE); out: g_free (path); -- cgit v1.2.1