X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fcompat.h;h=125d87527d7c01cc4e061116ae7af685015d9eec;hb=4fbda6a580ea77c11a507c1c45f1bceed3653722;hp=ced3083084261a8c7a4f6950b366d03aecfad028;hpb=dec96029b4a132f3a4f6d7a05b84a66588f47165;p=util-vserver.git diff --git a/util-vserver/compat.h b/util-vserver/compat.h index ced3083..125d875 100644 --- a/util-vserver/compat.h +++ b/util-vserver/compat.h @@ -31,17 +31,24 @@ #if defined(__GNUC__) # define UNUSED __attribute__((__unused__)) # define NORETURN __attribute__((__noreturn__)) -# if __GNUC__ >= 3 +# if __GNUC__>3 || (__GNUC__==3 && __GNUC__MINOR>=3) +# define NONNULL(ARGS) __attribute__((__nonnull__ ARGS)) # define ALWAYSINLINE __attribute__((__always_inline__)) # else +# define NONNULL(ARGS) # define ALWAYSINLINE # endif #else +# define NONNULL(ARGS) # define UNUSED # define NORETURN # define ALWAYSINLINE #endif +#if !defined(__STDC_VERSION__) || (__STDC_VERSION__<199901L) +# define restrict +#endif + #if !defined(HAVE_DECL_MS_MOVE) || !(HAVE_DECL_MS_MOVE) // from # define MS_MOVE 8192 @@ -61,5 +68,6 @@ typedef uint32_t ctx_t; __result; })) #endif +#define FMT_PREFIX utilvserver_fmt_ #endif // H_UTIL_VSERVER_COMPAT_H