emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
"Vladimir N. Oleynik" 2006-02-20 12:15:10 +00:00
parent d24d083061
commit 0c6ff43a0c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libbb.h
View File

@ -387,7 +387,9 @@ void reset_ino_dev_hashtable(void);
/* Stupid gcc always includes its own builtin strlen()... */
extern size_t bb_strlen(const char *string);
#ifndef BB_STRLEN_IMPLEMENTATION
#define strlen(x) bb_strlen(x)
#endif
char *bb_xasprintf(const char *format, ...) __attribute__ ((format (printf, 1, 2)));

10
libbb/xfuncs.c
View File

@ -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));