A few minor portability improvements

Signed-off-by: Dan Fandrich <dan@coneharvesters.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/archival/libunarchive/unxz/xz_config.h b/archival/libunarchive/unxz/xz_config.h
index ff90eff266eeaef8d29273d10085d423e030e785..a4141e136ca2a0c1c2d84eeae6b133f9ab418597 100644 (file)
--- a/archival/libunarchive/unxz/xz_config.h
+++ b/archival/libunarchive/unxz/xz_config.h
@@ -32,7 +32,9 @@
 #define memeq(a, b, size) (memcmp(a, b, size) == 0)
 #define memzero(buf, size) memset(buf, 0, size)
 
+#ifndef min
 #define min(x, y) ((x) < (y) ? (x) : (y))
+#endif
 #define min_t(type, x, y) min(x, y)
 
 /*

diff --git a/include/platform.h b/include/platform.h
index f87add552515f24e983dc83e5398865f4bbd1e01..4bd7a3d2e318fb5e7c42fddddd5898d4f16e51ff 100644 (file)
--- a/include/platform.h
+++ b/include/platform.h
@@ -168,10 +168,10 @@
 #if defined(__BIG_ENDIAN__) && __BIG_ENDIAN__
 # define BB_BIG_ENDIAN 1
 # define BB_LITTLE_ENDIAN 0
-#elif __BYTE_ORDER == __BIG_ENDIAN
+#elif defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN
 # define BB_BIG_ENDIAN 1
 # define BB_LITTLE_ENDIAN 0
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
+#elif (defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN) || defined(__386__)
 # define BB_BIG_ENDIAN 0
 # define BB_LITTLE_ENDIAN 1
 #else

diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index c3ee633e4c0d9e00187aa83534d5e54359404bf9..2de6de7c51830167da7e992237d57fb13caca3ee 100644 (file)
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -7,6 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
+#include <sys/types.h>
 #include <sys/socket.h> /* netinet/in.h needs it */
 #include <netinet/in.h>
 #include <net/if.h>

diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 17b21635460117d8946586f314fcaa13e9f2bf1f..87f31fdb53eb02dc01d6acd5e1e043488aa9b373 100644 (file)
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -12,11 +12,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
+#include "libbb.h"
+
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
-#include "libbb.h"
-
 #define CLASS_A_NETMASK        ntohl(0xFF000000)
 #define CLASS_B_NETMASK        ntohl(0xFFFF0000)
 #define CLASS_C_NETMASK        ntohl(0xFFFFFF00)

diff --git a/shell/hush.c b/shell/hush.c
index 4832e2c48e7efa9d2951c8747442398ef800d0b0..e64c923b48319896ba4c71109f5244d710cc1c8e 100644 (file)
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1217,7 +1217,7 @@ static void hush_exit(int exitcode)
 
 static int check_and_run_traps(int sig)
 {
-       static const struct timespec zero_timespec = { 0, 0 };
+       static const struct timespec zero_timespec;
        smalluint save_rcode;
        int last_sig = 0;