From dd31354acd51a8de819d561dfeada45c6ba9a8aa Mon Sep 17 00:00:00 2001
From: Robert Love <rml@novell.com>
Date: Mon, 27 Mar 2006 15:20:28 +0000
Subject: [PATCH] 2006-03-27  Robert Love  <rml@novell.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	Patch by Jürg Billeter <j@bitron.ch>:
	* src/nm-logging.c: Add printf modifier to fix warning on 64-bit
	  systems.
	* src/nm-netlink-monitor.c: Include <net/if.h> instead of <linux/if.h>
	  as we prefer glibc over kernel headers, if possible.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1641 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
---
 ChangeLog                | 8 ++++++++
 src/nm-logging.c         | 2 +-
 src/nm-netlink-monitor.c | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8c7bb8529..6aa1d95cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-27  Robert Love  <rml@novell.com>
+
+	Patch by Jürg Billeter <j@bitron.ch>:
+	* src/nm-logging.c: Add printf modifier to fix warning on 64-bit
+	  systems.
+	* src/nm-netlink-monitor.c: Include <net/if.h> instead of <linux/if.h>
+	  as we prefer glibc over kernel headers, if possible.
+
 2006-03-27  Robert Love  <rml@novell.com>
 
 	Patch by Jon Escombe <list@dresco.co.uk>:
diff --git a/src/nm-logging.c b/src/nm-logging.c
index 7d409cd4f..b2d34ab4c 100644
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -46,7 +46,7 @@ fallback_get_backtrace (void)
 	{
 		syslog (LOG_CRIT, "******************* START **********************************");
 		for (i = 0; i < size; i++)
-			syslog (LOG_CRIT, "Frame %d: %s", i, strings[i]);
+			syslog (LOG_CRIT, "Frame %zd: %s", i, strings[i]);
 		free (strings);
 		syslog (LOG_CRIT, "******************* END **********************************");
 	}
diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c
index 8d9297e5f..5ee4b3453 100644
--- a/src/nm-netlink-monitor.c
+++ b/src/nm-netlink-monitor.c
@@ -30,7 +30,7 @@
 #include <linux/types.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
-#include <linux/if.h>
+#include <net/if.h>
 #include <linux/unistd.h>
 #include <unistd.h>
 #include <stdio.h>