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
This commit is contained in:
Dan Williams
2005-03-04 21:25:45 +00:00
parent e57c4c85a6
commit a8dfb489fb
5 changed files with 11 additions and 4 deletions

View File

@@ -1,3 +1,8 @@
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>
* uk.po: Added "uk" (Ukrainian) to ALL_LINGUAS.

View File

@@ -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])

View File

@@ -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)

View File

@@ -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);

View File

@@ -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);