summaryrefslogtreecommitdiff
path: root/libbb/xfuncs.c
diff options
context:
space:
mode:
authorRob Landley2006-05-04 21:22:27 +0000
committerRob Landley2006-05-04 21:22:27 +0000
commit552b56dfd188d32a14a48ff1d81ee6ca05fc9834 (patch)
tree9a9e066f977385ad1f1c081ad75e2174a13487a8 /libbb/xfuncs.c
parent3b89039c25c8eb15435ed4f87bc8cb31c7941064 (diff)
downloadbusybox-552b56dfd188d32a14a48ff1d81ee6ca05fc9834.zip
busybox-552b56dfd188d32a14a48ff1d81ee6ca05fc9834.tar.gz
Not quite compiler independent, but we've never tried to be gcc independent
anyway. This is at least less ugly than what was there before, and fixes building all sources at once.
Diffstat (limited to 'libbb/xfuncs.c')
-rw-r--r--libbb/xfuncs.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 3db526b..f1f988f 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -14,15 +14,7 @@
#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"
-
+#include "busybox.h"
#ifndef DMALLOC
#ifdef L_xmalloc
@@ -182,10 +174,12 @@ void bb_xfflush_stdout(void)
}
#endif
+// GCC forces inlining of strlen everywhere, which is generally a byte
+// larger than calling a function, and it's called a lot so it adds up.
#ifdef L_strlen
size_t bb_strlen(const char *string)
{
- return(strlen(string));
+ return(__builtin_strlen(string));
}
#endif