Commit a8dfb489 authored by Dan Williams's avatar Dan Williams
Browse files

2005-03-04 Dan Williams <dcbw@redhat.com>

	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
parent e57c4c85
2005-03-04 Dan Williams <dcbw@redhat.com>
Patch from Peter Jones:
- Make stuff work with gcc 4.0
2005-02-28 Maxim Dziumanenko <mvd@mylinux.com.ua> 2005-02-28 Maxim Dziumanenko <mvd@mylinux.com.ua>
* uk.po: Added "uk" (Ukrainian) to ALL_LINGUAS. * uk.po: Added "uk" (Ukrainian) to ALL_LINGUAS.
......
...@@ -243,7 +243,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then ...@@ -243,7 +243,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS" 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" SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option" CFLAGS="$CFLAGS $option"
AC_MSG_CHECKING([whether gcc understands $option]) AC_MSG_CHECKING([whether gcc understands $option])
......
...@@ -591,8 +591,10 @@ static void nm_data_free (NMData *data) ...@@ -591,8 +591,10 @@ static void nm_data_free (NMData *data)
static void sigterm_handler (int signum) static void sigterm_handler (int signum)
{ {
int ignore;
syslog (LOG_NOTICE, "Caught SIGINT/SIGTERM"); 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) static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer user_data)
......
...@@ -279,7 +279,7 @@ void nm_ap_set_encrypted (NMAccessPoint *ap, gboolean encrypted) ...@@ -279,7 +279,7 @@ void nm_ap_set_encrypted (NMAccessPoint *ap, gboolean encrypted)
* Return the encryption method the user specified for this access point. * 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); g_return_val_if_fail (ap != NULL, TRUE);
......
...@@ -43,7 +43,7 @@ void nm_ap_set_essid (NMAccessPoint *ap, const char *essid); ...@@ -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_source (const NMAccessPoint *ap);
char * nm_ap_get_enc_key_hashed (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); 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); NMDeviceAuthMethod nm_ap_get_auth_method (const NMAccessPoint *ap);
void nm_ap_set_auth_method (NMAccessPoint *ap, const NMDeviceAuthMethod auth_method); void nm_ap_set_auth_method (NMAccessPoint *ap, const NMDeviceAuthMethod auth_method);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment