From 7b15e32bdb1dfafc3755ac54ce740952083e9c4c Mon Sep 17 00:00:00 2001 From: Robert Love Date: Mon, 9 Jan 2006 16:57:09 +0000 Subject: [PATCH] 2006-01-09 Robert Love * src/nm-device-802-3-ethernet.h: The kernel headers and leak the kernel-only types u16, u32, et al. User-space does not supply these types, so we have to define them ourselves. The relevant kernel maintainer refused to accept a patch switching these headers to the propre C99 types. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1304 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 13 ++++++++++--- src/nm-device-802-3-ethernet.h | 13 ++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 624eb8a5d5..25111e0d10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,20 @@ +2006-01-09 Robert Love + + * src/nm-device-802-3-ethernet.h: The kernel headers and + leak the kernel-only types u16, u32, et al. + User-space does not supply these types, so we have to define them + ourselves. The relevant kernel maintainer refused to accept a patch + switching these headers to the propre C99 types. + 2006-01-09 Dan Williams Apply Robert's 'tray icon redo' patch with fixes - * gnome/applet/applet.c gnome/applet/applet.h - Instead of using a menu bar + menu item, simulate menu behavior using a popup menu. Highlight the area around - the icon more like a menu too, by playing with the applet's - size requisition + the icon more like a menu too, by playing with the + applet's size requisition 2006-01-09 Timo Hoenig * libnm-util/dbus-helpers.c diff --git a/src/nm-device-802-3-ethernet.h b/src/nm-device-802-3-ethernet.h index 62d96c4b54..f911c126a1 100644 --- a/src/nm-device-802-3-ethernet.h +++ b/src/nm-device-802-3-ethernet.h @@ -26,9 +26,20 @@ #include #include - #include "nm-device.h" +/* + * The kernel headers and leak the kernel-only + * types u16, u32, et al. User-space does not supply these types, so we define + * them here. + */ +#ifndef u64 +# define u64 __u64 +# define u32 __u32 +# define u16 __u16 +# define u8 __u8 +#endif + G_BEGIN_DECLS #define NM_TYPE_DEVICE_802_3_ETHERNET (nm_device_802_3_ethernet_get_type ())