cosmetics on top of Dan's patches
No binary (build failed)
—
(log yok)
| @@ -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) | |
| /* | |
| @@ -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) | |
| @@ -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) | |