Add macosx fix from #1407
[openwrt.git] / package / busybox / patches / 401-darwin_includes.patch
1 --- busybox-1.3.1/include/platform.h    2006-12-27 05:56:18.000000000 +0100
2 +++ busybox-1.3.1.new/include/platform.h        2007-01-02 18:28:25.000000000 +0100
3 @@ -128,9 +128,11 @@
4  # include <netinet/in.h>
5  #endif
6  
7 +#ifndef __APPLE__
8  #ifndef __socklen_t_defined
9  typedef int socklen_t;
10  #endif
11 +#endif
12  
13  /* ---- Compiler dependent settings ------------------------- */
14  #ifndef __GNUC__
15 @@ -168,7 +170,7 @@
16  #define HAVE_STDINT_H
17  #else
18  /* Largest integral types.  */
19 -#if __BIG_ENDIAN__
20 +#if __BIG_ENDIAN__ && !__APPLE__
21  typedef long int                intmax_t;
22  typedef unsigned long int       uintmax_t;
23  #else
24 --- busybox-1.3.1/include/libbb.h       2006-12-27 05:56:18.000000000 +0100
25 +++ busybox-1.3.1.new/include/libbb.h   2007-01-02 18:29:13.000000000 +0100
26 @@ -17,7 +17,9 @@
27  #include <errno.h>
28  #include <fcntl.h>
29  #include <inttypes.h>
30 +#ifndef __APPLE__
31  #include <malloc.h>
32 +#endif
33  #include <netdb.h>
34  #include <setjmp.h>
35  #include <signal.h>
36 @@ -30,7 +32,9 @@
37  #include <sys/mman.h>
38  #include <sys/socket.h>
39  #include <sys/stat.h>
40 +#ifndef __APPLE__
41  #include <sys/statfs.h>
42 +#endif
43  #include <sys/time.h>
44  #include <sys/types.h>
45  #include <sys/wait.h>