diff options
| author | Denys Vlasenko | 2016-03-14 18:23:33 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2016-03-14 18:23:33 +0100 |
| commit | dbb58a3879c2daa3e286a8cd9da7935e264f3072 (patch) | |
| tree | dd79ea5de5b85926f4bea7298a44238f1c221f18 /include | |
| parent | 1b7c17391de66502dd7a97c866e0a33681edbb1f (diff) | |
| download | busybox-dbb58a3879c2daa3e286a8cd9da7935e264f3072.zip busybox-dbb58a3879c2daa3e286a8cd9da7935e264f3072.tar.gz | |
fixes for problems found by bionic build
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/include/libbb.h b/include/libbb.h index d05ac29..8b226c0 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -142,14 +142,18 @@ # include <netinet/in.h> #else # include <arpa/inet.h> -# if !defined(__socklen_t_defined) && !defined(_SOCKLEN_T_DECLARED) -/* We #define socklen_t *after* includes, otherwise we get - * typedef redefinition errors from system headers - * (in case "is it defined already" detection above failed) - */ -# define socklen_t bb_socklen_t - typedef unsigned socklen_t; -# endif +//This breaks on bionic: +//# if !defined(__socklen_t_defined) && !defined(_SOCKLEN_T_DECLARED) +///* We #define socklen_t *after* includes, otherwise we get +// * typedef redefinition errors from system headers +// * (in case "is it defined already" detection above failed) +// */ +//# define socklen_t bb_socklen_t +// typedef unsigned socklen_t; +//# endif +//if this is still needed, add a fix along the lines of +// ifdef SPECIFIC_BROKEN_LIBC_CHECK / typedef socklen_t / endif +//in platform.h instead! #endif #ifndef HAVE_CLEARENV # define clearenv() do { if (environ) environ[0] = NULL; } while (0) |