diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/busybox/patches/patch-include_platform_h | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/busybox/patches/patch-include_platform_h')
| -rw-r--r-- | package/busybox/patches/patch-include_platform_h | 55 |
1 files changed, 36 insertions, 19 deletions
diff --git a/package/busybox/patches/patch-include_platform_h b/package/busybox/patches/patch-include_platform_h index b3c9ffd7f..7c5539efe 100644 --- a/package/busybox/patches/patch-include_platform_h +++ b/package/busybox/patches/patch-include_platform_h @@ -1,30 +1,47 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- busybox-1.13.4.orig/include/platform.h 2008-11-09 18:28:17.000000000 +0100 -+++ busybox-1.13.4/include/platform.h 2009-05-08 22:48:50.000000000 +0200 -@@ -116,7 +116,7 @@ - # include <sex.h> - # define __BIG_ENDIAN__ (BYTE_ORDER == BIG_ENDIAN) - # define __BYTE_ORDER BYTE_ORDER +--- busybox-1.15.2.orig/include/platform.h Sat Sep 26 15:14:33 2009 ++++ busybox-1.15.2/include/platform.h Sat Dec 19 12:53:00 2009 +@@ -7,6 +7,8 @@ + #ifndef BB_PLATFORM_H + #define BB_PLATFORM_H 1 + ++#include <sys/param.h> ++ + /* Convenience macros to test the version of gcc. */ + #undef __GNUC_PREREQ + #if defined __GNUC__ && defined __GNUC_MINOR__ +@@ -133,7 +135,7 @@ char *strchrnul(const char *s, int c); + # define bswap_32 __bswap32 + # define bswap_16 __bswap16 + # define __BIG_ENDIAN__ (_BYTE_ORDER == _BIG_ENDIAN) -#elif !defined __APPLE__ -+#elif !(defined __APPLE__ || defined __FreeBSD__) ++#elif !(defined __APPLE__ || defined BSD) # include <byteswap.h> # include <endian.h> #endif -@@ -162,7 +162,7 @@ +@@ -190,7 +192,7 @@ char *strchrnul(const char *s, int c); /* ---- Networking ------------------------------------------ */ -#ifndef __APPLE__ -+#if !(defined __APPLE__ || defined __FreeBSD__) ++#if !(defined __APPLE__ || defined BSD) # include <arpa/inet.h> - # ifndef __socklen_t_defined + # if !defined(__socklen_t_defined) && !defined(_SOCKLEN_T_DECLARED) typedef int socklen_t; -@@ -210,7 +210,7 @@ __extension__ typedef unsigned long long - #define HAVE_FEATURES_H - #include <stdint.h> - #define HAVE_STDINT_H +@@ -202,7 +204,7 @@ typedef int socklen_t; + /* ---- Compiler dependent settings ------------------------- */ + + #if (defined __digital__ && defined __unix__) \ +- || defined __APPLE__ || defined __FreeBSD__ ++ || defined __APPLE__ || defined __FreeBSD__ || defined BSD + # undef HAVE_MNTENT_H + # undef HAVE_SYS_STATFS_H + #else +@@ -231,7 +233,7 @@ typedef int socklen_t; + # define HAVE_FEATURES_H + # include <stdint.h> + # define HAVE_STDINT_H -#elif !defined __APPLE__ -+#elif !(defined __APPLE__ || defined __FreeBSD__) - /* Largest integral types. */ - #if __BIG_ENDIAN__ - typedef long intmax_t; ++#elif !(defined __APPLE__ || defined BSD) + /* Largest integral types. */ + # if BB_BIG_ENDIAN + /* Looks BROKEN! */ |