summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-06-19 18:07:23 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-06-19 18:07:23 (GMT)
commit134d0eb114ac67693eb62bb030dd537eca71c48d (patch)
tree4241093db43409bfda1e9f8c6a91949a7de551ef
parentebeac1685a6230abcf73ca36755e3bb208bfd569 (diff)
downloadbusybox-134d0eb114ac67693eb62bb030dd537eca71c48d.tar.gz
busybox-134d0eb114ac67693eb62bb030dd537eca71c48d.tar.bz2
cosmetics on top of Dan's patches
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/libunarchive/unxz/xz_config.h4
-rw-r--r--networking/ipcalc.c4
-rwxr-xr-xscripts/trylink1
3 files changed, 3 insertions, 6 deletions
diff --git a/archival/libunarchive/unxz/xz_config.h b/archival/libunarchive/unxz/xz_config.h
index a4141e1..187e1cb 100644
--- a/archival/libunarchive/unxz/xz_config.h
+++ b/archival/libunarchive/unxz/xz_config.h
@@ -32,9 +32,9 @@
#define memeq(a, b, size) (memcmp(a, b, size) == 0)
#define memzero(buf, size) memset(buf, 0, size)
-#ifndef min
+#undef min
+#undef min_t
#define min(x, y) ((x) < (y) ? (x) : (y))
-#endif
#define min_t(type, x, y) min(x, y)
/*
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 87f31fd..265009a 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -11,10 +11,8 @@
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-
#include "libbb.h"
-
-#include <sys/socket.h>
+/* After libbb.h, because on some systems it needs other includes */
#include <arpa/inet.h>
#define CLASS_A_NETMASK ntohl(0xFF000000)
diff --git a/scripts/trylink b/scripts/trylink
index 021374a..5994a75 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -87,7 +87,6 @@ SORT_SECTION=`check_cc "-Wl,--sort-section,alignment" ""`
START_GROUP="-Wl,--start-group"
END_GROUP="-Wl,--end-group"
-
INFO_OPTS="-Wl,--warn-common -Wl,-Map,$EXE.map -Wl,--verbose"
# gold may not support --sort-common (yet)