--- net-snmp-5.4/configure.ethtool-config	2007-01-11 17:26:28.000000000 +0100
+++ net-snmp-5.4/configure	2007-01-11 17:26:28.000000000 +0100
@@ -32741,10 +32741,10 @@
 /* end confdefs.h.  */
 
 #include <sys/types.h>
-typedef unsigned long long u64;         /* hack, so we may include kernel's ethtool.h */
-typedef __uint32_t u32;         /* ditto */
-typedef __uint16_t u16;         /* ditto */
-typedef __uint8_t u8;           /* ditto */
+typedef unsigned long long __u64;         /* hack, so we may include kernel's ethtool.h */
+typedef __uint32_t __u32;         /* ditto */
+typedef __uint16_t __u16;         /* ditto */
+typedef __uint8_t __u8;           /* ditto */
 
 
 #include <$ac_header>
--- net-snmp-5.4/agent/mibgroup/if-mib/data_access/interface_linux.c.ethtool-config	2006-09-21 15:09:18.000000000 +0200
+++ net-snmp-5.4/agent/mibgroup/if-mib/data_access/interface_linux.c	2007-01-11 17:27:32.000000000 +0100
@@ -26,10 +26,10 @@
 #include <unistd.h>
 
 #ifdef HAVE_LINUX_ETHTOOL_H
-typedef unsigned long long u64;         /* hack, so we may include kernel's ethtool.h */
-typedef __uint32_t u32;         /* ditto */
-typedef __uint16_t u16;         /* ditto */
-typedef __uint8_t u8;           /* ditto */
+typedef unsigned long long __u64;         /* hack, so we may include kernel's ethtool.h */
+typedef __uint32_t __u32;         /* ditto */
+typedef __uint16_t __u16;         /* ditto */
+typedef __uint8_t __u8;           /* ditto */
 #include <linux/ethtool.h>
 #endif /* HAVE_LINUX_ETHTOOL_H */
 #include <linux/sockios.h>