From e05d4bfda4329447a05b0d0d2b1d18ddf19357b2 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 7 Jan 2007 23:13:39 +0000
Subject: [PATCH] fix howl build on 2.4 after [6004]: <linux/ethtool.h> uses u*
 types on 2.4 and __u* types on 2.6, so keep the typedefs for 2.4 and use
 <linux/types.f> for 2.6 and everyone should be happy :)

SVN-Revision: 6021
---
 libs/howl/patches/04-linux_types.patch | 11 +++++++++
 libs/howl/patches/04-typedefs.patch    | 32 --------------------------
 2 files changed, 11 insertions(+), 32 deletions(-)
 create mode 100644 libs/howl/patches/04-linux_types.patch
 delete mode 100644 libs/howl/patches/04-typedefs.patch

diff --git a/libs/howl/patches/04-linux_types.patch b/libs/howl/patches/04-linux_types.patch
new file mode 100644
index 0000000000..ee36760c7e
--- /dev/null
+++ b/libs/howl/patches/04-linux_types.patch
@@ -0,0 +1,11 @@
+diff -ruN howl-1.0.0-old/src/lib/howl/Posix/posix_interface.c howl-1.0.0-new/src/lib/howl/Posix/posix_interface.c
+--- howl-1.0.0-old/src/lib/howl/Posix/posix_interface.c	2005-05-19 23:39:27.000000000 +0200
++++ howl-1.0.0-new/src/lib/howl/Posix/posix_interface.c	2007-01-07 23:56:54.000000000 +0100
+@@ -41,6 +41,7 @@
+ typedef __uint32_t 	u32;
+ typedef __uint16_t 	u16;
+ typedef __uint8_t		u8;
++#	include <linux/types.h>
+ #	include <linux/sockios.h>
+ #	include <linux/ethtool.h> 
+ #endif
diff --git a/libs/howl/patches/04-typedefs.patch b/libs/howl/patches/04-typedefs.patch
deleted file mode 100644
index 76c68d1975..0000000000
--- a/libs/howl/patches/04-typedefs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -u10 -r howl-1.0.0/src/lib/howl/Posix/posix_interface.c howl-1.0.0-patched/src/lib/howl/Posix/posix_interface.c
---- howl-1.0.0/src/lib/howl/Posix/posix_interface.c	2007-01-03 01:16:03.000000000 -0800
-+++ howl-1.0.0-patched/src/lib/howl/Posix/posix_interface.c	2007-01-03 00:55:44.000000000 -0800
-@@ -30,24 +30,24 @@
- #include <salt/debug.h>
- #include <salt/interface.h>
- #include <net/if.h> 
- #include <arpa/inet.h>
- #include <errno.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
- #include <stdio.h>
- 
- #if defined(__linux__)
--typedef unsigned long long u64;
--typedef __uint32_t 	u32;
--typedef __uint16_t 	u16;
--typedef __uint8_t		u8;
-+typedef unsigned long long __u64;
-+typedef __uint32_t 	__u32;
-+typedef __uint16_t 	__u16;
-+typedef __uint8_t		__u8;
- #	include <linux/sockios.h>
- #	include <linux/ethtool.h> 
- #endif
- 
- #ifndef SIOCGIFCONF
- #	include <sys/sockio.h>
- #endif
- 
- #define SW_E_BAD_ARG 23
- 
-- 
2.30.2