remove #undef strlen, use #define strlen always but without xfunc/BB_STRLEN_IMPLEMENTATION

1 files changed, 7 insertions, 3 deletions

diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 69eaf79e0..6d54c1a79 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -14,6 +14,13 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
+
+/* Since gcc always inlines strlen(), this saves a byte or two, but we need
+ * the #undef here to avoid endless loop from #define strlen bb_strlen */
+#ifdef L_strlen
+#define BB_STRLEN_IMPLEMENTATION
+#endif
+
 #include "libbb.h"
 
 
@@ -167,9 +174,6 @@ extern void bb_xfflush_stdout(void)
 #endif
 
 #ifdef L_strlen
-/* Since gcc always inlines strlen(), this saves a byte or two, but we need
- * the #undef here to avoid endless loop from #define strlen bb_strlen */
-#undef strlen
 size_t bb_strlen(const char *string)
 {
 	    return(strlen(string));