diff options
| author | Rob Landley <rob@landley.net> | 2006-06-15 16:00:42 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-06-15 16:00:42 +0000 |
| commit | 148734df99896c0c6f33950f38b61d076171311b (patch) | |
| tree | 50aab34281f1d225df26bec6b37c6d0bb69961f1 | |
| parent | 22d26fc6ae2af584482deaf92f25bb6a7261ad78 (diff) | |
| download | busybox-w32-148734df99896c0c6f33950f38b61d076171311b.tar.gz busybox-w32-148734df99896c0c6f33950f38b61d076171311b.tar.bz2 busybox-w32-148734df99896c0c6f33950f38b61d076171311b.zip | |
We came up with our own names for ATTRIBUTE_*, so why check if they're already
#defined? Also remove a check for a gcc version older than RH9 (if non-linux
needs that #define they can put it in their section.)
| -rw-r--r-- | include/platform.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/platform.h b/include/platform.h index 5dbfb7783..f23d1fb0b 100644 --- a/include/platform.h +++ b/include/platform.h | |||
| @@ -48,39 +48,23 @@ | |||
| 48 | # define __const const | 48 | # define __const const |
| 49 | #endif | 49 | #endif |
| 50 | 50 | ||
| 51 | #ifndef ATTRIBUTE_UNUSED | ||
| 52 | # define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) | 51 | # define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) |
| 53 | #endif /* ATTRIBUTE_UNUSED */ | ||
| 54 | |||
| 55 | #ifndef ATTRIBUTE_NORETURN | ||
| 56 | # define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) | 52 | # define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) |
| 57 | #endif /* ATTRIBUTE_NORETURN */ | ||
| 58 | |||
| 59 | #ifndef ATTRIBUTE_PACKED | ||
| 60 | # define ATTRIBUTE_PACKED __attribute__ ((__packed__)) | 53 | # define ATTRIBUTE_PACKED __attribute__ ((__packed__)) |
| 61 | #endif /* ATTRIBUTE_PACKED */ | ||
| 62 | |||
| 63 | #ifndef ATTRIBUTE_ALIGNED | ||
| 64 | # define ATTRIBUTE_ALIGNED(m) __attribute__ ((__aligned__(m))) | 54 | # define ATTRIBUTE_ALIGNED(m) __attribute__ ((__aligned__(m))) |
| 65 | #endif /* ATTRIBUTE_ALIGNED */ | ||
| 66 | |||
| 67 | #ifndef ATTRIBUTE_ALWAYS_INLINE | ||
| 68 | # if __GNUC_PREREQ (3,0) | 55 | # if __GNUC_PREREQ (3,0) |
| 69 | # define ATTRIBUTE_ALWAYS_INLINE __attribute__ ((always_inline)) inline | 56 | # define ATTRIBUTE_ALWAYS_INLINE __attribute__ ((always_inline)) inline |
| 70 | # else | 57 | # else |
| 71 | # define ATTRIBUTE_ALWAYS_INLINE inline | 58 | # define ATTRIBUTE_ALWAYS_INLINE inline |
| 72 | # endif | 59 | # endif |
| 73 | #endif | ||
| 74 | 60 | ||
| 75 | /* -fwhole-program makes all symbols local. The attribute externally_visible | 61 | /* -fwhole-program makes all symbols local. The attribute externally_visible |
| 76 | forces a symbol global. */ | 62 | forces a symbol global. */ |
| 77 | #ifndef ATTRIBUTE_EXTERNALLY_VISIBLE | ||
| 78 | # if __GNUC_PREREQ (4,1) | 63 | # if __GNUC_PREREQ (4,1) |
| 79 | # define ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((__externally_visible__)) | 64 | # define ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((__externally_visible__)) |
| 80 | # else | 65 | # else |
| 81 | # define ATTRIBUTE_EXTERNALLY_VISIBLE | 66 | # define ATTRIBUTE_EXTERNALLY_VISIBLE |
| 82 | # endif /* GNUC >= 4.1 */ | 67 | # endif /* GNUC >= 4.1 */ |
| 83 | #endif /* ATTRIBUTE_EXTERNALLY_VISIBLE */ | ||
| 84 | 68 | ||
| 85 | /* We use __extension__ in some places to suppress -pedantic warnings | 69 | /* We use __extension__ in some places to suppress -pedantic warnings |
| 86 | about GCC extensions. This feature didn't work properly before | 70 | about GCC extensions. This feature didn't work properly before |
| @@ -187,12 +171,6 @@ typedef unsigned long long int uintmax_t; | |||
| 187 | #endif | 171 | #endif |
| 188 | #endif | 172 | #endif |
| 189 | 173 | ||
| 190 | // Is this for non-linux systems, or what? | ||
| 191 | |||
| 192 | #if !((__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)) | ||
| 193 | #define lchown chown | ||
| 194 | #endif | ||
| 195 | |||
| 196 | /* uclibc does not implement daemon for no-mmu systems. | 174 | /* uclibc does not implement daemon for no-mmu systems. |
| 197 | * For 0.9.29 and svn, __ARCH_USE_MMU__ indicates no-mmu reliably. | 175 | * For 0.9.29 and svn, __ARCH_USE_MMU__ indicates no-mmu reliably. |
| 198 | * For earlier versions there is no reliable way to check if we are building | 176 | * For earlier versions there is no reliable way to check if we are building |