X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fcompat.h;h=60a79d7b08799d85b021564381d8d9cb7f628005;hb=bb23ba0d1b3ab139512fd137a5e7f7241a49c2d6;hp=e66ed1b4ccfd3cdc448a7cd9b537dc7362a5fb3a;hpb=6f11b01808ef8f5dfaec0483c110f745dde43c13;p=util-vserver.git diff --git a/util-vserver/compat.h b/util-vserver/compat.h index e66ed1b..60a79d7 100644 --- a/util-vserver/compat.h +++ b/util-vserver/compat.h @@ -19,27 +19,61 @@ #ifndef H_UTIL_VSERVER_COMPAT_H #define H_UTIL_VSERVER_COMPAT_H +#if defined(__dietlibc__) && !defined(ENSC_DIETLIBC_C99) && defined(__STRICT_ANSI__) && defined(__STDC_VERSION__) +# include +# undef inline + +# undef __STRICT_ANSI__ +# include +# 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 +# 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 #endif -#ifndef HAVE_CTX_T -typedef short int ctx_t; +#ifndef HAVE_XID_T +#include +typedef uint32_t xid_t; #endif +#if defined(__dietlibc__) + #define TEMP_FAILURE_RETRY(expression) \ + (__extension__ \ + ({ long int __result; \ + do __result = (long int) (expression); \ + while (__result == -1L && errno == EINTR); \ + __result; })) +#endif + +#define FMT_PREFIX utilvserver_fmt_ + #endif // H_UTIL_VSERVER_COMPAT_H