X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fcompat.h;h=9f5eccdb3b59076e8ca3f9bdd9b8c11d7fbdaa6b;hb=b78ef7a1590f358c18d2a0d74abaaee1201adfc1;hp=125d87527d7c01cc4e061116ae7af685015d9eec;hpb=42f574e5245952ef869e72cdb0513c3f8ea20ade;p=util-vserver.git diff --git a/util-vserver/compat.h b/util-vserver/compat.h index 125d875..9f5eccd 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,6 +28,12 @@ # 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__)) @@ -38,11 +44,17 @@ # define NONNULL(ARGS) # define ALWAYSINLINE # endif +# if __GNUC__>3 +# define PURE __attribute__((__pure__)) +# else +# define PURE +# endif #else # define NONNULL(ARGS) # define UNUSED # define NORETURN # define ALWAYSINLINE +# define PURE #endif #if !defined(__STDC_VERSION__) || (__STDC_VERSION__<199901L) @@ -54,9 +66,9 @@ # define MS_MOVE 8192 #endif -#ifndef HAVE_CTX_T +#ifndef HAVE_XID_T #include -typedef uint32_t ctx_t; +typedef uint32_t xid_t; #endif #if defined(__dietlibc__)