From 3c1259fd9f90626a08dc399df3458850a37b4e6b Mon Sep 17 00:00:00 2001 From: Robert Love Date: Mon, 17 Oct 2005 19:04:01 +0000 Subject: [PATCH] 2005-10-17 Robert Love * src/nm-ip4-config.c: use GPOINTER_TO_UINT and not a straight cast in order to remain 64-bit clean. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1031 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 9 +++++++-- src/nm-ip4-config.c | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9eb304c72..856ed2475c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,8 +5,13 @@ 2005-10-17 Robert Love - * src/backends/NetworkManagerDebian.c, - src/backends/NetworkManagerRedHat.c, + * src/nm-ip4-config.c: use GPOINTER_TO_UINT and not a straight cast + in order to remain 64-bit clean. + +2005-10-17 Robert Love + + * src/backends/NetworkManagerDebian.c, + src/backends/NetworkManagerRedHat, src/backends/NetworkManagerSuSE.c: allow '#' as a valid resolv.conf comment delimiter. diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index e3a502ebd4..31c9db5d51 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -182,12 +182,12 @@ void nm_ip4_config_add_nameserver (NMIP4Config *config, guint32 nameserver) guint32 nm_ip4_config_get_nameserver (NMIP4Config *config, guint index) { - guint32 nameserver; + guint nameserver; g_return_val_if_fail (config != NULL, 0); g_return_val_if_fail (index < g_slist_length (config->nameservers), 0); - if ((nameserver = (guint32) g_slist_nth_data (config->nameservers, index))) + if ((nameserver = GPOINTER_TO_UINT (g_slist_nth_data (config->nameservers, index)))) return nameserver; return 0; }