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=ab18aea40c50929d437600349419257ec60c33b4;hpb=28d1ab8272cf0688dd1090e66987ff7d5b369522;p=util-vserver.git diff --git a/util-vserver/compat.h b/util-vserver/compat.h index ab18aea..43d920c 100644 --- a/util-vserver/compat.h +++ b/util-vserver/compat.h @@ -19,23 +19,57 @@ #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 + +# 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 +# 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) +# define restrict #endif #if !defined(HAVE_DECL_MS_MOVE) || !(HAVE_DECL_MS_MOVE) @@ -43,8 +77,26 @@ # 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 + +#ifndef HAVE_NID_T +#include +typedef uint32_t nid_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