/[magellan-source]/trunk/mkinitrd-magellan/busybox/include/platform.h

Diff of /trunk/mkinitrd-magellan/busybox/include/platform.h

Parent Directory | Revision Log | View Patch Patch

-revision 983 by niro,
Fri Apr 24 18:33:46 2009 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 4
     Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
- #ifndef	__PLATFORM_H
+ #ifndef	BB_PLATFORM_H
- #define __PLATFORM_H	1
+ #define BB_PLATFORM_H 1
+ /* Assume all these functions exist by default.  Platforms where it is not
+  * true will #undef them below.
+  */
+ #define HAVE_FDPRINTF 1
+ #define HAVE_MEMRCHR 1
+ #define HAVE_MKDTEMP 1
+ #define HAVE_SETBIT 1
+ #define HAVE_STRCASESTR 1
+ #define HAVE_STRCHRNUL 1
+ #define HAVE_STRSIGNAL 1
+ #define HAVE_VASPRINTF 1
  /* Convenience macros to test the version of gcc. */
  #undef __GNUC_PREREQ
-Line 19
+Line 31
  /* __restrict is known in EGCS 1.2 and above. */
  #if !__GNUC_PREREQ(2,92)
  # ifndef __restrict
- #  define __restrict     /* Ignore */
+ #  define __restrict
  # endif
  #endif
-Line 36
+Line 48
  #undef inline
  #if defined(__STDC_VERSION__) && __STDC_VERSION__ > 199901L
  /* it's a keyword */
+ #elif __GNUC_PREREQ(2,7)
+ # define inline __inline__
  #else
- # if __GNUC_PREREQ(2,7)
+ # define inline
- #  define inline __inline__
- # else
- #  define inline
- # endif
  #endif
  #ifndef __const
-Line 50
+Line 60
  #define UNUSED_PARAM __attribute__ ((__unused__))
  #define NORETURN __attribute__ ((__noreturn__))
+ /* "The malloc attribute is used to tell the compiler that a function
+  * may be treated as if any non-NULL pointer it returns cannot alias
+  * any other pointer valid when the function returns. This will often
+  * improve optimization. Standard functions with this property include
+  * malloc and calloc. realloc-like functions have this property as long
+  * as the old pointer is never referred to (including comparing it
+  * to the new pointer) after the function returns a non-NULL value."
+  */
+ #define RETURNS_MALLOC __attribute__ ((malloc))
  #define PACKED __attribute__ ((__packed__))
  #define ALIGNED(m) __attribute__ ((__aligned__(m)))
  /* __NO_INLINE__: some gcc's do not honor inlining! :( */
  #if __GNUC_PREREQ(3,0) && !defined(__NO_INLINE__)
  # define ALWAYS_INLINE __attribute__ ((always_inline)) inline
-Line 61
+Line 81
  #  define DEPRECATED __attribute__ ((__deprecated__))
  #  define UNUSED_PARAM_RESULT __attribute__ ((warn_unused_result))
  # else
- #  define DEPRECATED /* n/a */
+ #  define DEPRECATED
- #  define UNUSED_PARAM_RESULT /* n/a */
+ #  define UNUSED_PARAM_RESULT
  # endif
  #else
- # define ALWAYS_INLINE inline /* n/a */
+ # define ALWAYS_INLINE inline
- # define NOINLINE /* n/a */
+ # define NOINLINE
- # define DEPRECATED /* n/a */
+ # define DEPRECATED
- # define UNUSED_PARAM_RESULT /* n/a */
+ # define UNUSED_PARAM_RESULT
  #endif
  /* -fwhole-program makes all symbols local. The attribute externally_visible
-Line 78
+Line 98
  //__attribute__ ((__externally_visible__))
  #else
  # define EXTERNALLY_VISIBLE
- #endif /* GNUC >= 4.1 */
+ #endif
  /* We use __extension__ in some places to suppress -pedantic warnings
     about GCC extensions.  This feature didn't work properly before
-Line 110
+Line 130
  # define FAST_FUNC
  #endif
+ /* Make all declarations hidden (-fvisibility flag only affects definitions) */
+ /* (don't include system headers after this until corresponding pop!) */
+ #if __GNUC_PREREQ(4,1)
+ # define PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN _Pragma("GCC visibility push(hidden)")
+ # define POP_SAVED_FUNCTION_VISIBILITY              _Pragma("GCC visibility pop")
+ #else
+ # define PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
+ # define POP_SAVED_FUNCTION_VISIBILITY
+ #endif
  /* ---- Endian Detection ------------------------------------ */
- #if (defined __digital__ && defined __unix__)
+ #if defined(__digital__) && defined(__unix__)
  # include <sex.h>
  # define __BIG_ENDIAN__ (BYTE_ORDER == BIG_ENDIAN)
  # define __BYTE_ORDER BYTE_ORDER
+ #elif defined __FreeBSD__
+ # include <sys/resource.h>	/* rlimit */
+ # include <machine/endian.h>
+ # define bswap_64 __bswap64
+ # define bswap_32 __bswap32
+ # define bswap_16 __bswap16
+ # define __BIG_ENDIAN__ (_BYTE_ORDER == _BIG_ENDIAN)
  #elif !defined __APPLE__
  # include <byteswap.h>
  # include <endian.h>
  #endif
- #ifdef __BIG_ENDIAN__
+ #if defined(__BIG_ENDIAN__) && __BIG_ENDIAN__
  # define BB_BIG_ENDIAN 1
  # define BB_LITTLE_ENDIAN 0
  #elif __BYTE_ORDER == __BIG_ENDIAN
  # define BB_BIG_ENDIAN 1
  # define BB_LITTLE_ENDIAN 0
- #else
+ #elif __BYTE_ORDER == __LITTLE_ENDIAN
  # define BB_BIG_ENDIAN 0
  # define BB_LITTLE_ENDIAN 1
+ #else
+ # error "Can't determine endianness"
  #endif
  /* SWAP_LEnn means "convert CPU<->little_endian by swapping bytes" */
  #if BB_BIG_ENDIAN
- #define SWAP_BE16(x) (x)
+ # define SWAP_BE16(x) (x)
- #define SWAP_BE32(x) (x)
+ # define SWAP_BE32(x) (x)
- #define SWAP_BE64(x) (x)
+ # define SWAP_BE64(x) (x)
- #define SWAP_LE16(x) bswap_16(x)
+ # define SWAP_LE16(x) bswap_16(x)
- #define SWAP_LE32(x) bswap_32(x)
+ # define SWAP_LE32(x) bswap_32(x)
- #define SWAP_LE64(x) bswap_64(x)
+ # define SWAP_LE64(x) bswap_64(x)
  #else
- #define SWAP_BE16(x) bswap_16(x)
+ # define SWAP_BE16(x) bswap_16(x)
- #define SWAP_BE32(x) bswap_32(x)
+ # define SWAP_BE32(x) bswap_32(x)
- #define SWAP_BE64(x) bswap_64(x)
+ # define SWAP_BE64(x) bswap_64(x)
- #define SWAP_LE16(x) (x)
+ # define SWAP_LE16(x) (x)
- #define SWAP_LE32(x) (x)
+ # define SWAP_LE32(x) (x)
- #define SWAP_LE64(x) (x)
+ # define SWAP_LE64(x) (x)
  #endif
  /* ---- Unaligned access ------------------------------------ */
- /* parameter is supposed to be an uint32_t* ptr */
+ /* NB: unaligned parameter should be a pointer, aligned one -
+  * a lvalue. This makes it more likely to not swap them by mistake
+  */
  #if defined(i386) || defined(__x86_64__)
- #define get_unaligned_u32p(u32p) (*(u32p))
+ # define move_from_unaligned_int(v, intp) ((v) = *(int*)(intp))
+ # define move_from_unaligned16(v, u16p) ((v) = *(uint16_t*)(u16p))
+ # define move_from_unaligned32(v, u32p) ((v) = *(uint32_t*)(u32p))
+ # define move_to_unaligned32(u32p, v)   (*(uint32_t*)(u32p) = (v))
  /* #elif ... - add your favorite arch today! */
  #else
  /* performs reasonably well (gcc usually inlines memcpy here) */
- #define get_unaligned_u32p(u32p) ({ uint32_t __t; memcpy(&__t, (u32p), 4); __t; })
+ # define move_from_unaligned_int(v, intp) (memcpy(&(v), (intp), sizeof(int)))
+ # define move_from_unaligned16(v, u16p) (memcpy(&(v), (u16p), 2))
+ # define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
+ # define move_to_unaligned32(u32p, v) do { \
+ 	uint32_t __t = (v); \
+ 	memcpy((u32p), &__t, 4); \
+ } while (0)
  #endif
  /* ---- Networking ------------------------------------------ */
  #ifndef __APPLE__
  # include <arpa/inet.h>
- # ifndef __socklen_t_defined
+ # if !defined(__socklen_t_defined) && !defined(_SOCKLEN_T_DECLARED)
  typedef int socklen_t;
  # endif
  #else
-Line 173 
 typedef int socklen_t;
+Line 223 
 typedef int socklen_t;
  /* ---- Compiler dependent settings ------------------------- */
- #if (defined __digital__ && defined __unix__) || defined __APPLE__
+ #if (defined __digital__ && defined __unix__) \
+  || defined __APPLE__ || defined __FreeBSD__
  # undef HAVE_MNTENT_H
  # undef HAVE_SYS_STATFS_H
  #else
  # define HAVE_MNTENT_H 1
  # define HAVE_SYS_STATFS_H 1
- #endif /* ___digital__ && __unix__ */
- /* linux/loop.h relies on __u64. Make sure we have that as a proper type
-  * until userspace is widely fixed.  */
- #if (defined __INTEL_COMPILER && !defined __GNUC__) || \
- 	(defined __GNUC__ && defined __STRICT_ANSI__)
- __extension__ typedef __signed__ long long __s64;
- __extension__ typedef unsigned long long __u64;
  #endif
  /*----- Kernel versioning ------------------------------------*/
-Line 205 
 __extension__ typedef unsigned long long
+Line 248 
 __extension__ typedef unsigned long long
  /* Don't perpetuate e2fsck crap into the headers.  Clean up e2fsck instead. */
  #if defined __GLIBC__ || defined __UCLIBC__ \
- 	|| defined __dietlibc__ || defined _NEWLIB_VERSION
+  || defined __dietlibc__ || defined _NEWLIB_VERSION
- #include <features.h>
+ # include <features.h>
- #define HAVE_FEATURES_H
+ # define HAVE_FEATURES_H
- #include <stdint.h>
+ # include <stdint.h>
- #define HAVE_STDINT_H
+ # define HAVE_STDINT_H
  #elif !defined __APPLE__
- /* Largest integral types.  */
+ /* Largest integral types. */
- #if __BIG_ENDIAN__
+ # if BB_BIG_ENDIAN
+ /* Looks BROKEN! */
  typedef long                intmax_t;
  typedef unsigned long       uintmax_t;
- #else
+ # else
  __extension__
  typedef long long           intmax_t;
  __extension__
  typedef unsigned long long  uintmax_t;
- #endif
+ # endif
  #endif
  /* Size-saving "small" ints (arch-dependent) */
-Line 237 
 typedef unsigned smalluint;
+Line 281 
 typedef unsigned smalluint;
  /* ISO C Standard:  7.16  Boolean type and values  <stdbool.h> */
  #if (defined __digital__ && defined __unix__)
  /* old system without (proper) C99 support */
- #define bool smalluint
+ # define bool smalluint
  #else
  /* modern system, so use it */
- #include <stdbool.h>
+ # include <stdbool.h>
  #endif
  /* Try to defeat gcc's alignment of "char message[]"-like data */
  #if 1 /* if needed: !defined(arch1) && !defined(arch2) */
- #define ALIGN1 __attribute__((aligned(1)))
+ # define ALIGN1 __attribute__((aligned(1)))
- #define ALIGN2 __attribute__((aligned(2)))
+ # define ALIGN2 __attribute__((aligned(2)))
  #else
  /* Arches which MUST have 2 or 4 byte alignment for everything are here */
- #define ALIGN1
+ # define ALIGN1
- #define ALIGN2
+ # define ALIGN2
  #endif
-Line 262 
 typedef unsigned smalluint;
+Line 306 
 typedef unsigned smalluint;
  #if ENABLE_NOMMU || \
      (defined __UCLIBC__ && __UCLIBC_MAJOR__ >= 0 && __UCLIBC_MINOR__ >= 9 && \
      __UCLIBC_SUBLEVEL__ > 28 && !defined __ARCH_USE_MMU__)
- #define BB_MMU 0
+ # define BB_MMU 0
- #define USE_FOR_NOMMU(...) __VA_ARGS__
+ # define USE_FOR_NOMMU(...) __VA_ARGS__
- #define USE_FOR_MMU(...)
+ # define USE_FOR_MMU(...)
  #else
- #define BB_MMU 1
+ # define BB_MMU 1
- #define USE_FOR_NOMMU(...)
+ # define USE_FOR_NOMMU(...)
- #define USE_FOR_MMU(...) __VA_ARGS__
+ # define USE_FOR_MMU(...) __VA_ARGS__
- #endif
- /* Platforms that haven't got dprintf need to implement fdprintf() in
-  * libbb.  This would require a platform.c.  It's not going to be cleaned
-  * out of the tree, so stop saying it should be. */
- #if !defined(__dietlibc__)
- /* Needed for: glibc */
- /* Not needed for: dietlibc */
- /* Others: ?? (add as needed) */
- #define fdprintf dprintf
- #endif
- #if defined(__dietlibc__)
- static ALWAYS_INLINE char* strchrnul(const char *s, char c)
- {
- 	while (*s && *s != c) ++s;
- 	return (char*)s;
- }
  #endif
- /* Don't use lchown with glibc older than 2.1.x ... uClibc lacks it */
+ /* Don't use lchown with glibc older than 2.1.x */
- #if (defined __GLIBC__ && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 1) || \
+ #if defined(__GLIBC__) && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 1
-     defined __UC_LIBC__
  # define lchown chown
  #endif
- #if (defined __digital__ && defined __unix__)
+ #if defined(__digital__) && defined(__unix__)
- #include <standards.h>
- #define HAVE_STANDARDS_H
- #include <inttypes.h>
- #define HAVE_INTTYPES_H
- #define PRIu32 "u"
+ # include <standards.h>
+ # include <inttypes.h>
+ # define PRIu32 "u"
  /* use legacy setpgrp(pid_t,pid_t) for now.  move to platform.c */
- #define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me,__me); } while (0)
+ # define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me, __me); } while (0)
+ # if !defined ADJ_OFFSET_SINGLESHOT && defined MOD_CLKA && defined MOD_OFFSET
- #if !defined ADJ_OFFSET_SINGLESHOT && defined MOD_CLKA && defined MOD_OFFSET
+ #  define ADJ_OFFSET_SINGLESHOT (MOD_CLKA | MOD_OFFSET)
- #define ADJ_OFFSET_SINGLESHOT (MOD_CLKA | MOD_OFFSET)
+ # endif
- #endif
+ # if !defined ADJ_FREQUENCY && defined MOD_FREQUENCY
- #if !defined ADJ_FREQUENCY && defined MOD_FREQUENCY
+ #  define ADJ_FREQUENCY MOD_FREQUENCY
- #define ADJ_FREQUENCY MOD_FREQUENCY
+ # endif
- #endif
+ # if !defined ADJ_TIMECONST && defined MOD_TIMECONST
- #if !defined ADJ_TIMECONST && defined MOD_TIMECONST
+ #  define ADJ_TIMECONST MOD_TIMECONST
- #define ADJ_TIMECONST MOD_TIMECONST
+ # endif
- #endif
+ # if !defined ADJ_TICK && defined MOD_CLKB
- #if !defined ADJ_TICK && defined MOD_CLKB
+ #  define ADJ_TICK MOD_CLKB
- #define ADJ_TICK MOD_CLKB
+ # endif
- #endif
  #else
- #define bb_setpgrp() setpgrp()
+ # define bb_setpgrp() setpgrp()
  #endif
- #if defined(__linux__)
+ #if defined(__GLIBC__)
- #include <sys/mount.h>
+ # define fdprintf dprintf
- /* Make sure we have all the new mount flags we actually try to use. */
- #ifndef MS_BIND
- #define MS_BIND        (1<<12)
  #endif
- #ifndef MS_MOVE
- #define MS_MOVE        (1<<13)
+ #if defined(__dietlibc__)
+ # undef HAVE_STRCHRNUL
  #endif
- #ifndef MS_RECURSIVE
- #define MS_RECURSIVE   (1<<14)
+ #if defined(__WATCOMC__)
+ # undef HAVE_FDPRINTF
+ # undef HAVE_MEMRCHR
+ # undef HAVE_MKDTEMP
+ # undef HAVE_SETBIT
+ # undef HAVE_STRCASESTR
+ # undef HAVE_STRCHRNUL
+ # undef HAVE_STRSIGNAL
+ # undef HAVE_VASPRINTF
  #endif
- #ifndef MS_SILENT
- #define MS_SILENT      (1<<15)
+ #if defined(__FreeBSD__)
+ # undef HAVE_STRCHRNUL
  #endif
- /* The shared subtree stuff, which went in around 2.6.15. */
+ /*
- #ifndef MS_UNBINDABLE
+  * Now, define prototypes for all the functions defined in platform.c
- #define MS_UNBINDABLE  (1<<17)
+  * These must come after all the HAVE_* macros are defined (or not)
+  */
+ #ifndef HAVE_FDPRINTF
+ extern int fdprintf(int fd, const char *format, ...);
  #endif
- #ifndef MS_PRIVATE
- #define MS_PRIVATE     (1<<18)
+ #ifndef HAVE_MEMRCHR
+ extern void *memrchr(const void *s, int c, size_t n) FAST_FUNC;
  #endif
- #ifndef MS_SLAVE
- #define MS_SLAVE       (1<<19)
+ #ifndef HAVE_MKDTEMP
+ extern char *mkdtemp(char *template) FAST_FUNC;
  #endif
- #ifndef MS_SHARED
- #define MS_SHARED      (1<<20)
+ #ifndef HAVE_SETBIT
+ # define setbit(a, b)  ((a)[(b) >> 3] |= 1 << ((b) & 7))
+ # define clrbit(a, b)  ((a)[(b) >> 3] &= ~(1 << ((b) & 7)))
  #endif
- #ifndef MS_RELATIME
- #define MS_RELATIME   (1 << 21)
+ #ifndef HAVE_STRCASESTR
+ extern char *strcasestr(const char *s, const char *pattern) FAST_FUNC;
  #endif
- #if !defined(BLKSSZGET)
+ #ifndef HAVE_STRCHRNUL
- #define BLKSSZGET _IO(0x12, 104)
+ extern char *strchrnul(const char *s, int c) FAST_FUNC;
  #endif
- #if !defined(BLKGETSIZE64)
- #define BLKGETSIZE64 _IOR(0x12,114,size_t)
+ #ifndef HAVE_STRSIGNAL
+ /* Not exactly the same: instead of "Stopped" it shows "STOP" etc */
+ # define strsignal(sig) get_signame(sig)
  #endif
+ #ifndef HAVE_VASPRINTF
+ extern int vasprintf(char **string_ptr, const char *format, va_list p) FAST_FUNC;
  #endif
- #endif	/* platform.h	*/
+ #endif

 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
-Removed from v.983
+Added in v.984