aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Dan Fandrich <dan@coneharvesters.com>2010-06-18 22:37:42 -0700
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2010-06-19 20:03:15 +0200
commitfdd7b566ecdc174907f38d9389b28ba842d2b4bf (patch)
tree38e5f9a61da8c6ed5155d3542fd0d56aaf157714
parenteb08b6ed5cc7bb764658cd7a3b829e2b3aac4abc (diff)
downloadbusybox-fdd7b566ecdc174907f38d9389b28ba842d2b4bf.tar.gz
busybox-fdd7b566ecdc174907f38d9389b28ba842d2b4bf.tar.bz2
A few minor portability improvements
Signed-off-by: Dan Fandrich <dan@coneharvesters.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/libunarchive/unxz/xz_config.h2
-rw-r--r--include/platform.h4
-rw-r--r--libbb/xconnect.c1
-rw-r--r--networking/ipcalc.c4
-rw-r--r--shell/hush.c2
5 files changed, 8 insertions, 5 deletions
diff --git a/archival/libunarchive/unxz/xz_config.h b/archival/libunarchive/unxz/xz_config.h
index ff90eff26..a4141e136 100644
--- 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 f87add552..4bd7a3d2e 100644
--- 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 c3ee633e4..2de6de7c5 100644
--- 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 17b216354..87f31fdb5 100644
--- 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 4832e2c48..e64c923b4 100644
--- 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;