From a8dfb489fbf990d25817884eef5e2bda3185fde7 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 4 Mar 2005 21:25:45 +0000 Subject: [PATCH] 2005-03-04 Dan Williams Patch from Peter Jones: - Make stuff work with gcc 4.0 git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@490 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ configure.in | 2 +- src/NetworkManager.c | 4 +++- src/NetworkManagerAP.c | 2 +- src/NetworkManagerAP.h | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 532b89714..d2fd14c3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-03-04 Dan Williams + + Patch from Peter Jones: + - Make stuff work with gcc 4.0 + 2005-02-28 Maxim Dziumanenko * uk.po: Added "uk" (Ukrainian) to ALL_LINGUAS. diff --git a/configure.in b/configure.in index 5ce4274ab..301862761 100644 --- a/configure.in +++ b/configure.in @@ -243,7 +243,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then AC_MSG_RESULT(yes) CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS" - for option in -Wno-unused -Wno-strict-aliasing -Wno-sign-compare -Wdeclaration-after-statement; do + for option in -Wno-unused -Wno-strict-aliasing -Wno-sign-compare -Wdeclaration-after-statement -Wno-pointer-sign ; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" AC_MSG_CHECKING([whether gcc understands $option]) diff --git a/src/NetworkManager.c b/src/NetworkManager.c index 558c19eb6..b89dbe6df 100644 --- a/src/NetworkManager.c +++ b/src/NetworkManager.c @@ -591,8 +591,10 @@ static void nm_data_free (NMData *data) static void sigterm_handler (int signum) { + int ignore; + syslog (LOG_NOTICE, "Caught SIGINT/SIGTERM"); - write (nm_data->sigterm_pipe[1], "X", 1); + ignore = write (nm_data->sigterm_pipe[1], "X", 1); } static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer user_data) diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c index 0bb80b5fe..f679c68f7 100644 --- a/src/NetworkManagerAP.c +++ b/src/NetworkManagerAP.c @@ -279,7 +279,7 @@ void nm_ap_set_encrypted (NMAccessPoint *ap, gboolean encrypted) * Return the encryption method the user specified for this access point. * */ -const NMEncKeyType nm_ap_get_enc_type (const NMAccessPoint *ap) +NMEncKeyType nm_ap_get_enc_type (const NMAccessPoint *ap) { g_return_val_if_fail (ap != NULL, TRUE); diff --git a/src/NetworkManagerAP.h b/src/NetworkManagerAP.h index 2d32aee43..d190deb61 100644 --- a/src/NetworkManagerAP.h +++ b/src/NetworkManagerAP.h @@ -43,7 +43,7 @@ void nm_ap_set_essid (NMAccessPoint *ap, const char *essid); char * nm_ap_get_enc_key_source (const NMAccessPoint *ap); char * nm_ap_get_enc_key_hashed (const NMAccessPoint *ap); void nm_ap_set_enc_key_source (NMAccessPoint *ap, const char *key, NMEncKeyType type); -const NMEncKeyType nm_ap_get_enc_type (const NMAccessPoint *ap); +NMEncKeyType nm_ap_get_enc_type (const NMAccessPoint *ap); NMDeviceAuthMethod nm_ap_get_auth_method (const NMAccessPoint *ap); void nm_ap_set_auth_method (NMAccessPoint *ap, const NMDeviceAuthMethod auth_method);