diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-19 10:49:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-19 10:49:49 +0200 |
| commit | 7907e3ee7302ac3fd428989a07b0df74f0c52853 (patch) | |
| tree | e6de18488a687707667927065724372b40510d65 /package/busybox/patches/patch-include_libbb_h | |
| parent | b70fdbfbf1139605c22083b647337f2b16f62fc3 (diff) | |
| parent | 61355d1f054c15673adeb62d32dfd4563f89c165 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/busybox/patches/patch-include_libbb_h')
| -rw-r--r-- | package/busybox/patches/patch-include_libbb_h | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/package/busybox/patches/patch-include_libbb_h b/package/busybox/patches/patch-include_libbb_h index 0087dbde5..4f08ed4e5 100644 --- a/package/busybox/patches/patch-include_libbb_h +++ b/package/busybox/patches/patch-include_libbb_h @@ -1,18 +1,23 @@ ---- busybox-1.15.2.orig/include/libbb.h Thu Oct 8 03:04:16 2009 -+++ busybox-1.15.2/include/libbb.h Sat Dec 19 12:42:57 2009 -@@ -48,6 +48,7 @@ - #define PATH_MAX 256 - #endif - +diff -Nur busybox-1.17.0.orig/include/libbb.h busybox-1.17.0/include/libbb.h +--- busybox-1.17.0.orig/include/libbb.h 2010-07-04 15:32:24.000000000 +0200 ++++ busybox-1.17.0/include/libbb.h 2010-07-08 12:27:04.531002165 +0200 +@@ -40,6 +40,9 @@ + /* Try to pull in PATH_MAX */ + #include <limits.h> + #include <sys/param.h> ++ +#if !(defined __APPLE__ || defined __FreeBSD__ || defined __MirBSD__ ) ++ #ifdef HAVE_MNTENT_H #include <mntent.h> #endif -@@ -61,6 +62,7 @@ - #include <selinux/context.h> +@@ -52,6 +55,9 @@ #include <selinux/flask.h> #include <selinux/av_permissions.h> -+#endif #endif - ++ ++#endif ++ #if ENABLE_LOCALE_SUPPORT + # include <locale.h> + #else |