diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:28:42 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:28:42 +1000 |
| commit | c6933c626b97c3f6bc446586ee2e6c7d9930c938 (patch) | |
| tree | 4999c2e1279c4b74747735adde3a047fec94b651 | |
| parent | ec71cb6575290eb6ad716e4f620db445d8e1bcd3 (diff) | |
| parent | 95b83ba4f81f0985e2aeb9aec9cd67db7d5d1126 (diff) | |
| download | busybox-w32-c6933c626b97c3f6bc446586ee2e6c7d9930c938.tar.gz busybox-w32-c6933c626b97c3f6bc446586ee2e6c7d9930c938.tar.bz2 busybox-w32-c6933c626b97c3f6bc446586ee2e6c7d9930c938.zip | |
Merge branch 'origin/master' (early part)
Conflicts:
include/platform.h
| -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 a98affb3a..a7814b75f 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -41,16 +41,16 @@ | |||
| 41 | #include <limits.h> | 41 | #include <limits.h> |
| 42 | #include <sys/param.h> | 42 | #include <sys/param.h> |
| 43 | #ifdef HAVE_MNTENT_H | 43 | #ifdef HAVE_MNTENT_H |
| 44 | #include <mntent.h> | 44 | # include <mntent.h> |
| 45 | #endif | 45 | #endif |
| 46 | #ifdef HAVE_SYS_STATFS_H | 46 | #ifdef HAVE_SYS_STATFS_H |
| 47 | #include <sys/statfs.h> | 47 | # include <sys/statfs.h> |
| 48 | #endif | 48 | #endif |
| 49 | #if ENABLE_SELINUX | 49 | #if ENABLE_SELINUX |
| 50 | #include <selinux/selinux.h> | 50 | # include <selinux/selinux.h> |
| 51 | #include <selinux/context.h> | 51 | # include <selinux/context.h> |
| 52 | #include <selinux/flask.h> | 52 | # include <selinux/flask.h> |
| 53 | #include <selinux/av_permissions.h> | 53 | # include <selinux/av_permissions.h> |
| 54 | #endif | 54 | #endif |
| 55 | #if ENABLE_LOCALE_SUPPORT | 55 | #if ENABLE_LOCALE_SUPPORT |
| 56 | # include <locale.h> | 56 | # include <locale.h> |
| @@ -70,7 +70,7 @@ | |||
| 70 | # include <shadow.h> | 70 | # include <shadow.h> |
| 71 | # endif | 71 | # endif |
| 72 | #endif | 72 | #endif |
| 73 | #if defined __FreeBSD__ | 73 | #if defined __FreeBSD__ || defined __OpenBSD__ |
| 74 | # include <netinet/in.h> | 74 | # include <netinet/in.h> |
| 75 | # include <arpa/inet.h> | 75 | # include <arpa/inet.h> |
| 76 | #elif defined __APPLE__ | 76 | #elif defined __APPLE__ |
diff --git a/include/platform.h b/include/platform.h index 9458e2e02..2f3639d9c 100644 --- a/include/platform.h +++ b/include/platform.h | |||
| @@ -178,7 +178,7 @@ | |||
| 178 | # define bswap_16(x) ((((x) & 0xFF00) >> 8) | (((x) & 0xFF) << 8)) | 178 | # define bswap_16(x) ((((x) & 0xFF00) >> 8) | (((x) & 0xFF) << 8)) |
| 179 | # define bswap_32(x) ((bswap_16(((x) & 0xFFFF0000L) >> 16)) | (bswap_16((x) & 0xFFFFL) << 16)) | 179 | # define bswap_32(x) ((bswap_16(((x) & 0xFFFF0000L) >> 16)) | (bswap_16((x) & 0xFFFFL) << 16)) |
| 180 | # define bswap_64(x) ((bswap_32(((x) & 0xFFFFFFFF00000000LL) >> 32)) | (bswap_32((x) & 0xFFFFFFFFLL) << 32)) | 180 | # define bswap_64(x) ((bswap_32(((x) & 0xFFFFFFFF00000000LL) >> 32)) | (bswap_32((x) & 0xFFFFFFFFLL) << 32)) |
| 181 | #elif !defined __APPLE__ | 181 | #elif !defined __APPLE__ && !defined __OpenBSD__ |
| 182 | # include <byteswap.h> | 182 | # include <byteswap.h> |
| 183 | # include <endian.h> | 183 | # include <endian.h> |
| 184 | #endif | 184 | #endif |
| @@ -189,9 +189,15 @@ | |||
| 189 | #elif defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN | 189 | #elif defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN |
| 190 | # define BB_BIG_ENDIAN 1 | 190 | # define BB_BIG_ENDIAN 1 |
| 191 | # define BB_LITTLE_ENDIAN 0 | 191 | # define BB_LITTLE_ENDIAN 0 |
| 192 | #elif defined(_BYTE_ORDER) && _BYTE_ORDER == _BIG_ENDIAN | ||
| 193 | # define BB_BIG_ENDIAN 1 | ||
| 194 | # define BB_LITTLE_ENDIAN 0 | ||
| 192 | #elif (defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN) || defined(__386__) | 195 | #elif (defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN) || defined(__386__) |
| 193 | # define BB_BIG_ENDIAN 0 | 196 | # define BB_BIG_ENDIAN 0 |
| 194 | # define BB_LITTLE_ENDIAN 1 | 197 | # define BB_LITTLE_ENDIAN 1 |
| 198 | #elif defined(_BYTE_ORDER) && _BYTE_ORDER == _LITTLE_ENDIAN | ||
| 199 | # define BB_BIG_ENDIAN 0 | ||
| 200 | # define BB_LITTLE_ENDIAN 1 | ||
| 195 | #else | 201 | #else |
| 196 | # error "Can't determine endianness" | 202 | # error "Can't determine endianness" |
| 197 | #endif | 203 | #endif |
| @@ -247,7 +253,7 @@ typedef uint32_t bb__aliased_uint32_t FIX_ALIASING; | |||
| 247 | /* ---- Compiler dependent settings ------------------------- */ | 253 | /* ---- Compiler dependent settings ------------------------- */ |
| 248 | 254 | ||
| 249 | #if (defined __digital__ && defined __unix__) \ | 255 | #if (defined __digital__ && defined __unix__) \ |
| 250 | || defined __APPLE__ || defined __FreeBSD__ \ | 256 | || defined __APPLE__ || defined __FreeBSD__ || defined __OpenBSD__ \ |
| 251 | || ENABLE_PLATFORM_MINGW32 | 257 | || ENABLE_PLATFORM_MINGW32 |
| 252 | # undef HAVE_MNTENT_H | 258 | # undef HAVE_MNTENT_H |
| 253 | # undef HAVE_SYS_STATFS_H | 259 | # undef HAVE_SYS_STATFS_H |
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 | |||
| 48 | fi | 48 | fi |
| 49 | 49 | ||
| 50 | # (Re)generate */Kbuild and */Config.in | 50 | # (Re)generate */Kbuild and */Config.in |
| 51 | { cd -- "$srctree" && find -type d; } | while read -r d; do | 51 | { cd -- "$srctree" && find . -type d; } | while read -r d; do |
| 52 | d="${d#./}" | 52 | d="${d#./}" |
| 53 | 53 | ||
| 54 | src="$srctree/$d/Kbuild.src" | 54 | src="$srctree/$d/Kbuild.src" |