mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
OpenBSD compatibility
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
6814cbc928
commit
95b83ba4f8
@ -41,16 +41,16 @@
|
|||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#ifdef HAVE_MNTENT_H
|
#ifdef HAVE_MNTENT_H
|
||||||
#include <mntent.h>
|
# include <mntent.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_SYS_STATFS_H
|
#ifdef HAVE_SYS_STATFS_H
|
||||||
#include <sys/statfs.h>
|
# include <sys/statfs.h>
|
||||||
#endif
|
#endif
|
||||||
#if ENABLE_SELINUX
|
#if ENABLE_SELINUX
|
||||||
#include <selinux/selinux.h>
|
# include <selinux/selinux.h>
|
||||||
#include <selinux/context.h>
|
# include <selinux/context.h>
|
||||||
#include <selinux/flask.h>
|
# include <selinux/flask.h>
|
||||||
#include <selinux/av_permissions.h>
|
# include <selinux/av_permissions.h>
|
||||||
#endif
|
#endif
|
||||||
#if ENABLE_LOCALE_SUPPORT
|
#if ENABLE_LOCALE_SUPPORT
|
||||||
# include <locale.h>
|
# include <locale.h>
|
||||||
@ -70,7 +70,7 @@
|
|||||||
# include <shadow.h>
|
# include <shadow.h>
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
#if defined __FreeBSD__
|
#if defined __FreeBSD__ || defined __OpenBSD__
|
||||||
# include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
# include <arpa/inet.h>
|
# include <arpa/inet.h>
|
||||||
#elif defined __APPLE__
|
#elif defined __APPLE__
|
||||||
|
@ -161,7 +161,7 @@
|
|||||||
# define bswap_32 __bswap32
|
# define bswap_32 __bswap32
|
||||||
# define bswap_16 __bswap16
|
# define bswap_16 __bswap16
|
||||||
# define __BIG_ENDIAN__ (_BYTE_ORDER == _BIG_ENDIAN)
|
# define __BIG_ENDIAN__ (_BYTE_ORDER == _BIG_ENDIAN)
|
||||||
#elif !defined __APPLE__
|
#elif !defined __APPLE__ && !defined __OpenBSD__
|
||||||
# include <byteswap.h>
|
# include <byteswap.h>
|
||||||
# include <endian.h>
|
# include <endian.h>
|
||||||
#endif
|
#endif
|
||||||
@ -172,9 +172,15 @@
|
|||||||
#elif defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN
|
#elif defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN
|
||||||
# define BB_BIG_ENDIAN 1
|
# define BB_BIG_ENDIAN 1
|
||||||
# define BB_LITTLE_ENDIAN 0
|
# 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__)
|
#elif (defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN) || defined(__386__)
|
||||||
# define BB_BIG_ENDIAN 0
|
# define BB_BIG_ENDIAN 0
|
||||||
# define BB_LITTLE_ENDIAN 1
|
# define BB_LITTLE_ENDIAN 1
|
||||||
|
#elif defined(_BYTE_ORDER) && _BYTE_ORDER == _LITTLE_ENDIAN
|
||||||
|
# define BB_BIG_ENDIAN 0
|
||||||
|
# define BB_LITTLE_ENDIAN 1
|
||||||
#else
|
#else
|
||||||
# error "Can't determine endianness"
|
# error "Can't determine endianness"
|
||||||
#endif
|
#endif
|
||||||
@ -230,7 +236,7 @@ typedef uint32_t bb__aliased_uint32_t FIX_ALIASING;
|
|||||||
/* ---- Compiler dependent settings ------------------------- */
|
/* ---- Compiler dependent settings ------------------------- */
|
||||||
|
|
||||||
#if (defined __digital__ && defined __unix__) \
|
#if (defined __digital__ && defined __unix__) \
|
||||||
|| defined __APPLE__ || defined __FreeBSD__
|
|| defined __APPLE__ || defined __FreeBSD__ || defined __OpenBSD__
|
||||||
# undef HAVE_MNTENT_H
|
# undef HAVE_MNTENT_H
|
||||||
# undef HAVE_SYS_STATFS_H
|
# undef HAVE_SYS_STATFS_H
|
||||||
#else
|
#else
|
||||||
|
@ -48,7 +48,7 @@ if test x"$new" != x"$old"; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# (Re)generate */Kbuild and */Config.in
|
# (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#./}"
|
d="${d#./}"
|
||||||
|
|
||||||
src="$srctree/$d/Kbuild.src"
|
src="$srctree/$d/Kbuild.src"
|
||||||
|
Loading…
Reference in New Issue
Block a user