X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fcompat.h;h=43d920cec18adbadd8cd04cf4d28e1059267c7ac;hb=d0d423bbe3f07930aea8ce8e4cfab6b15d403cec;hp=60a79d7b08799d85b021564381d8d9cb7f628005;hpb=f7f72a335688083c5df99cdd18fb6e0fca6fe0bf;p=util-vserver.git diff --git a/util-vserver/compat.h b/util-vserver/compat.h index 60a79d7..43d920c 100644 --- a/util-vserver/compat.h +++ b/util-vserver/compat.h @@ -37,18 +37,35 @@ #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) @@ -65,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__ \