bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 :)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@6021 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2007-01-07 23:13:39 +00:00
parent 96d8c6122d
commit 2186f4a86d
2 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/howl/patches/04-linux_types.patch Normal file
View File

@ -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

32
libs/howl/patches/04-typedefs.patch
View File

@ -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