X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fcompat.h;h=43d920cec18adbadd8cd04cf4d28e1059267c7ac;hb=4a45e6e86672850be9361fbb0ca99adae83e8ac3;hp=125d87527d7c01cc4e061116ae7af685015d9eec;hpb=42f574e5245952ef869e72cdb0513c3f8ea20ade;p=util-vserver.git diff --git a/util-vserver/compat.h b/util-vserver/compat.h index 125d875..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) @@ -54,11 +77,17 @@ # define MS_MOVE 8192 #endif -#ifndef HAVE_CTX_T +#ifndef HAVE_XID_T +#include +typedef uint32_t xid_t; +#endif + +#ifndef HAVE_NID_T #include -typedef uint32_t ctx_t; +typedef uint32_t nid_t; #endif + #if defined(__dietlibc__) #define TEMP_FAILURE_RETRY(expression) \ (__extension__ \