3 files changed, 3 insertions, 6 deletions
diff --git a/archival/libunarchive/unxz/xz_config.h b/archival/libunarchive/unxz/xz_config.h
index a4141e136..187e1cbed 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 87f31fdb5..265009ad8 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"
+/* After libbb.h, because on some systems it needs other includes */
-#include <sys/socket.h>
 #include <arpa/inet.h>
 #define CLASS_A_NETMASK ntohl(0xFF000000)
diff --git a/scripts/trylink b/scripts/trylink
index 021374aa9..5994a757b 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)

diff --git a/archival/libunarchive/unxz/xz_config.h b/archival/libunarchive/unxz/xz_config.h index a4141e136..187e1cbed 100644 --- a/archival/libunarchive/unxz/xz_config.h +++ b/archival/libunarchive/unxz/xz_config.h
@@ -32,9 +32,9 @@
32	#define memeq(a, b, size) (memcmp(a, b, size) == 0)	32	#define memeq(a, b, size) (memcmp(a, b, size) == 0)
33	#define memzero(buf, size) memset(buf, 0, size)	33	#define memzero(buf, size) memset(buf, 0, size)
34		34
35	#ifndef min	35	#undef min
		36	#undef min_t
36	#define min(x, y) ((x) < (y) ? (x) : (y))	37	#define min(x, y) ((x) < (y) ? (x) : (y))
37	#endif
38	#define min_t(type, x, y) min(x, y)	38	#define min_t(type, x, y) min(x, y)
39		39
40	/*	40	/*


diff --git a/networking/ipcalc.c b/networking/ipcalc.c index 87f31fdb5..265009ad8 100644 --- a/networking/ipcalc.c +++ b/networking/ipcalc.c
@@ -11,10 +11,8 @@
11	*	11	*
12	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.	12	* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
13	*/	13	*/
14
15	#include "libbb.h"	14	#include "libbb.h"
16		15	/* After libbb.h, because on some systems it needs other includes */
17	#include <sys/socket.h>
18	#include <arpa/inet.h>	16	#include <arpa/inet.h>
19		17
20	#define CLASS_A_NETMASK ntohl(0xFF000000)	18	#define CLASS_A_NETMASK ntohl(0xFF000000)


diff --git a/scripts/trylink b/scripts/trylink index 021374aa9..5994a757b 100755 --- a/scripts/trylink +++ b/scripts/trylink
@@ -87,7 +87,6 @@ SORT_SECTION=`check_cc "-Wl,--sort-section,alignment" ""`
87		87
88	START_GROUP="-Wl,--start-group"	88	START_GROUP="-Wl,--start-group"
89	END_GROUP="-Wl,--end-group"	89	END_GROUP="-Wl,--end-group"
90
91	INFO_OPTS="-Wl,--warn-common -Wl,-Map,$EXE.map -Wl,--verbose"	90	INFO_OPTS="-Wl,--warn-common -Wl,-Map,$EXE.map -Wl,--verbose"
92		91
93	# gold may not support --sort-common (yet)	92	# gold may not support --sort-common (yet)