f563e1086379488467fc41d0dc13ef4f7ffdbf36
[openwrt-10.03/.git] / package / busybox / patches / 401-darwin_includes.patch
1 Index: busybox-1.4.2/include/platform.h
2 ===================================================================
3 --- busybox-1.4.2.orig/include/platform.h       2007-06-04 13:21:32.055103552 +0200
4 +++ busybox-1.4.2/include/platform.h    2007-06-04 13:21:35.387596936 +0200
5 @@ -128,9 +128,11 @@
6  # include <netinet/in.h>
7  #endif
8  
9 +#ifndef __APPLE__
10  #ifndef __socklen_t_defined
11  typedef int socklen_t;
12  #endif
13 +#endif
14  
15  /* ---- Compiler dependent settings ------------------------- */
16  #if (defined __digital__ && defined __unix__)
17 @@ -161,7 +163,7 @@
18  #define HAVE_STDINT_H
19  #else
20  /* Largest integral types.  */
21 -#if __BIG_ENDIAN__
22 +#if __BIG_ENDIAN__ && !__APPLE__
23  typedef long int                intmax_t;
24  typedef unsigned long int       uintmax_t;
25  #else
26 Index: busybox-1.4.2/include/libbb.h
27 ===================================================================
28 --- busybox-1.4.2.orig/include/libbb.h  2007-06-04 13:21:32.062102488 +0200
29 +++ busybox-1.4.2/include/libbb.h       2007-06-04 13:21:35.388596784 +0200
30 @@ -17,7 +17,9 @@
31  #include <errno.h>
32  #include <fcntl.h>
33  #include <inttypes.h>
34 +#ifndef __APPLE__
35  #include <malloc.h>
36 +#endif
37  #include <netdb.h>
38  #include <setjmp.h>
39  #include <signal.h>
40 @@ -30,7 +32,9 @@
41  #include <sys/mman.h>
42  #include <sys/socket.h>
43  #include <sys/stat.h>
44 +#ifndef __APPLE__
45  #include <sys/statfs.h>
46 +#endif
47  #include <sys/time.h>
48  #include <sys/types.h>
49  #include <sys/wait.h>