diff options
| -rw-r--r-- | include/libbb.h | 14 | ||||
| -rw-r--r-- | include/platform.h | 10 | ||||
| -rwxr-xr-x | scripts/gen_build_files.sh | 2 |
3 files changed, 16 insertions, 10 deletions
diff --git a/include/libbb.h b/include/libbb.h index c043506b9..118d777bc 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -41,16 +41,16 @@ #include <limits.h> #include <sys/param.h> #ifdef HAVE_MNTENT_H -#include <mntent.h> +# include <mntent.h> #endif #ifdef HAVE_SYS_STATFS_H -#include <sys/statfs.h> +# include <sys/statfs.h> #endif #if ENABLE_SELINUX -#include <selinux/selinux.h> -#include <selinux/context.h> -#include <selinux/flask.h> -#include <selinux/av_permissions.h> +# include <selinux/selinux.h> +# include <selinux/context.h> +# include <selinux/flask.h> +# include <selinux/av_permissions.h> #endif #if ENABLE_LOCALE_SUPPORT # include <locale.h> @@ -70,7 +70,7 @@ # include <shadow.h> # endif #endif -#if defined __FreeBSD__ +#if defined __FreeBSD__ || defined __OpenBSD__ # include <netinet/in.h> # include <arpa/inet.h> #elif defined __APPLE__ diff --git a/include/platform.h b/include/platform.h index 0dadf42bd..1cc588690 100644 --- a/include/platform.h +++ b/include/platform.h @@ -161,7 +161,7 @@ # define bswap_32 __bswap32 # define bswap_16 __bswap16 # define __BIG_ENDIAN__ (_BYTE_ORDER == _BIG_ENDIAN) -#elif !defined __APPLE__ +#elif !defined __APPLE__ && !defined __OpenBSD__ # include <byteswap.h> # include <endian.h> #endif @@ -172,9 +172,15 @@ #elif defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN # define BB_BIG_ENDIAN 1 # define BB_LITTLE_ENDIAN 0 +#elif defined(_BYTE_ORDER) && _BYTE_ORDER == _BIG_ENDIAN +# define BB_BIG_ENDIAN 1 +# define BB_LITTLE_ENDIAN 0 #elif (defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN) || defined(__386__) # define BB_BIG_ENDIAN 0 # define BB_LITTLE_ENDIAN 1 +#elif defined(_BYTE_ORDER) && _BYTE_ORDER == _LITTLE_ENDIAN +# define BB_BIG_ENDIAN 0 +# define BB_LITTLE_ENDIAN 1 #else # error "Can't determine endianness" #endif @@ -230,7 +236,7 @@ typedef uint32_t bb__aliased_uint32_t FIX_ALIASING; /* ---- Compiler dependent settings ------------------------- */ #if (defined __digital__ && defined __unix__) \ - || defined __APPLE__ || defined __FreeBSD__ + || defined __APPLE__ || defined __FreeBSD__ || defined __OpenBSD__ # undef HAVE_MNTENT_H # undef HAVE_SYS_STATFS_H #else diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh index 18c172d5a..09a95b507 100755 --- a/scripts/gen_build_files.sh +++ b/scripts/gen_build_files.sh @@ -48,7 +48,7 @@ if test x"$new" != x"$old"; then fi # (Re)generate */Kbuild and */Config.in -{ cd -- "$srctree" && find -type d; } | while read -r d; do +{ cd -- "$srctree" && find . -type d; } | while read -r d; do d="${d#./}" src="$srctree/$d/Kbuild.src" |