[git commit master 1/1] cosmetics on top of Dan's patches

Denys Vlasenko vda.linux at googlemail.com
Sat Jun 19 18:07:23 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=134d0eb114ac67693eb62bb030dd537eca71c48d
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 archival/libunarchive/unxz/xz_config.h |    4 ++--
 networking/ipcalc.c                    |    4 +---
 scripts/trylink                        |    1 -
 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)
-- 
1.7.1



More information about the busybox-cvs mailing list