diff options
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 d05ac2976..8b226c00c 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -142,14 +142,18 @@ | |||
142 | # include <netinet/in.h> | 142 | # include <netinet/in.h> |
143 | #else | 143 | #else |
144 | # include <arpa/inet.h> | 144 | # include <arpa/inet.h> |
145 | # if !defined(__socklen_t_defined) && !defined(_SOCKLEN_T_DECLARED) | 145 | //This breaks on bionic: |
146 | /* We #define socklen_t *after* includes, otherwise we get | 146 | //# if !defined(__socklen_t_defined) && !defined(_SOCKLEN_T_DECLARED) |
147 | * typedef redefinition errors from system headers | 147 | ///* We #define socklen_t *after* includes, otherwise we get |
148 | * (in case "is it defined already" detection above failed) | 148 | // * typedef redefinition errors from system headers |
149 | */ | 149 | // * (in case "is it defined already" detection above failed) |
150 | # define socklen_t bb_socklen_t | 150 | // */ |
151 | typedef unsigned socklen_t; | 151 | //# define socklen_t bb_socklen_t |
152 | # endif | 152 | // typedef unsigned socklen_t; |
153 | //# endif | ||
154 | //if this is still needed, add a fix along the lines of | ||
155 | // ifdef SPECIFIC_BROKEN_LIBC_CHECK / typedef socklen_t / endif | ||
156 | //in platform.h instead! | ||
153 | #endif | 157 | #endif |
154 | #ifndef HAVE_CLEARENV | 158 | #ifndef HAVE_CLEARENV |
155 | # define clearenv() do { if (environ) environ[0] = NULL; } while (0) | 159 | # define clearenv() do { if (environ) environ[0] = NULL; } while (0) |