X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fcompat.h;h=43d920cec18adbadd8cd04cf4d28e1059267c7ac;hb=41815c3a043fd94adcbf54e52ee891a3e44313fa;hp=a58eaa27f2e39cf06dcaf281676f3d29911feecf;hpb=4c0037aecd96cf23da727c12381723ab5cbfa5e4;p=util-vserver.git diff --git a/util-vserver/compat.h b/util-vserver/compat.h index a58eaa2..43d920c 100644 --- a/util-vserver/compat.h +++ b/util-vserver/compat.h @@ -19,7 +19,7 @@ #ifndef H_UTIL_VSERVER_COMPAT_H #define H_UTIL_VSERVER_COMPAT_H -#if defined(__dietlibc__) && defined(__STRICT_ANSI__) && defined(__STDC_VERSION__) +#if defined(__dietlibc__) && !defined(ENSC_DIETLIBC_C99) && defined(__STRICT_ANSI__) && defined(__STDC_VERSION__) # include # undef inline @@ -28,21 +28,44 @@ # define __STRICT_ANSI__ #endif +#if defined(__dietlibc__) +# define ENSC_FIX_IOCTL(X) do { if ((X)<-1) { errno=-(X); (X) = -1; } } while (0) +#else +# define ENSC_FIX_IOCTL(X) do { } while (0) +#endif + #if defined(__GNUC__) # define UNUSED __attribute__((__unused__)) # define NORETURN __attribute__((__noreturn__)) -# if __GNUC__>3 || (__GNUC__==3 && __GNUC__MINOR>=3) +# define CONST __attribute__((__const__)) +# if __GNUC__*0x10000 + __GNUC_MINOR__*0x100 + __GNUC_PATCHLEVEL__ >= 0x30300 # define NONNULL(ARGS) __attribute__((__nonnull__ ARGS)) # define ALWAYSINLINE __attribute__((__always_inline__)) # else # define NONNULL(ARGS) # define ALWAYSINLINE +# define PURE +# endif +# if __GNUC__*0x10000 + __GNUC_MINOR__*0x100 + __GNUC_PATCHLEVEL__ >= 0x30303 +# define PURE __attribute__((__pure__)) +# else +# define PURE # endif #else # define NONNULL(ARGS) # define UNUSED # define NORETURN # define ALWAYSINLINE +# define PURE +# define CONST +#endif + + // shamelessly stolen from dietlibc +#define LINK_WARNING(symbol,msg) \ + __asm__ (".section .gnu.warning." symbol "\n\t.string \"" msg "\"\n\t.previous") + +#if !defined(__builtin_expect) && (__GNUC__+0)<3 +# define __builtin_expect(foo,bar) (foo) #endif #if !defined(__STDC_VERSION__) || (__STDC_VERSION__<199901L) @@ -59,6 +82,12 @@ typedef uint32_t xid_t; #endif +#ifndef HAVE_NID_T +#include +typedef uint32_t nid_t; +#endif + + #if defined(__dietlibc__) #define TEMP_FAILURE_RETRY(expression) \ (__extension__ \