add upstream fixes for 1.7.2

[openwrt.git] / package / busybox / patches / 401-darwin_includes.patch

diff --git a/package/busybox/patches/401-darwin_includes.patch b/package/busybox/patches/401-darwin_includes.patch
index a5602d9..6506f27 100644 (file)
--- a/package/busybox/patches/401-darwin_includes.patch
+++ b/package/busybox/patches/401-darwin_includes.patch
@@ -1,6 +1,8 @@
---- busybox-1.3.1/include/platform.h   2006-12-27 05:56:18.000000000 +0100
-+++ busybox-1.3.1.new/include/platform.h       2007-01-02 18:28:25.000000000 +0100
-@@ -128,9 +128,11 @@
+Index: busybox-1.7.2/include/platform.h
+===================================================================
+--- busybox-1.7.2.orig/include/platform.h      2007-09-03 13:48:46.000000000 +0200
++++ busybox-1.7.2/include/platform.h   2007-10-04 15:20:58.301274440 +0200
+@@ -137,9 +137,11 @@

  # include <netinet/in.h>
  #endif
  
  # include <netinet/in.h>
  #endif
  


@@ -11,29 +13,21 @@
 +#endif
  
  /* ---- Compiler dependent settings ------------------------- */
 +#endif
  
  /* ---- Compiler dependent settings ------------------------- */

- #ifndef __GNUC__
-@@ -168,7 +170,7 @@
+ #if (defined __digital__ && defined __unix__)
+@@ -179,7 +181,7 @@

  #define HAVE_STDINT_H
  #else
  /* Largest integral types.  */
 -#if __BIG_ENDIAN__
 +#if __BIG_ENDIAN__ && !__APPLE__
  #define HAVE_STDINT_H
  #else
  /* Largest integral types.  */
 -#if __BIG_ENDIAN__
 +#if __BIG_ENDIAN__ && !__APPLE__

- typedef long int                intmax_t;
- typedef unsigned long int       uintmax_t;
+ typedef long                intmax_t;
+ typedef unsigned long       uintmax_t;

  #else
  #else

---- busybox-1.3.1/include/libbb.h      2006-12-27 05:56:18.000000000 +0100
-+++ busybox-1.3.1.new/include/libbb.h  2007-01-02 18:29:13.000000000 +0100
-@@ -17,7 +17,9 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <inttypes.h>
-+#ifndef __APPLE__
- #include <malloc.h>
-+#endif
- #include <netdb.h>
- #include <setjmp.h>
- #include <signal.h>
-@@ -30,7 +32,9 @@
+Index: busybox-1.7.2/include/libbb.h
+===================================================================
+--- busybox-1.7.2.orig/include/libbb.h 2007-09-16 20:48:10.000000000 +0200
++++ busybox-1.7.2/include/libbb.h      2007-10-04 15:20:22.275221430 +0200
+@@ -31,7 +31,9 @@

  #include <sys/mman.h>
  #include <sys/socket.h>
  #include <sys/stat.h>
  #include <sys/mman.h>
  #include <sys/socket.h>
  #include <sys/stat.h>