diff options
| author | Rob Landley | 2006-05-04 21:22:27 +0000 |
|---|---|---|
| committer | Rob Landley | 2006-05-04 21:22:27 +0000 |
| commit | 552b56dfd188d32a14a48ff1d81ee6ca05fc9834 (patch) | |
| tree | 9a9e066f977385ad1f1c081ad75e2174a13487a8 /include | |
| parent | 3b89039c25c8eb15435ed4f87bc8cb31c7941064 (diff) | |
| download | busybox-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 'include')
| -rw-r--r-- | include/libbb.h | 6 | ||||
| -rw-r--r-- | include/platform.h | 16 |
2 files changed, 5 insertions, 17 deletions
diff --git a/include/libbb.h b/include/libbb.h index 8fc2dbb..4823979 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -414,12 +414,6 @@ int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name); void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name); 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))); #define FAIL_DELAY 3 diff --git a/include/platform.h b/include/platform.h index ea2983d..a8858a7 100644 --- a/include/platform.h +++ b/include/platform.h @@ -32,17 +32,6 @@ # endif #endif -#if 0 -/* Attribute __malloc__ on functions was valid as of gcc 2.96. */ -#ifndef ATTRIBUTE_MALLOC -# if __GNUC_PREREQ (2,96) -# define ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -# else -# define ATTRIBUTE_MALLOC -# endif /* GNUC >= 2.96 */ -#endif /* ATTRIBUTE_MALLOC */ -#endif - #ifndef ATTRIBUTE_UNUSED # define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) #endif /* ATTRIBUTE_UNUSED */ @@ -78,6 +67,11 @@ # endif #endif +#ifdef __GNUC__ +#define strlen(x) bb_strlen(x) +extern size_t bb_strlen(const char *string); +#endif + /* ---- Endian Detection ------------------------------------ */ #ifndef __APPLE__ # include <byteswap.h> |