X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2Fvserver.h;h=42b0e5ff7827ac8cdab855f72bd8743c3b0c20c6;hb=b3ff38bc5349de0f78d90bd461605876dd3f93da;hp=5bb170a31b9d2cc4f334971906e9678d56cce85a;hpb=a283210e2f9c919a6f84998980238d65e32bcaa3;p=util-vserver.git diff --git a/util-vserver/lib/vserver.h b/util-vserver/lib/vserver.h index 5bb170a..42b0e5f 100644 --- a/util-vserver/lib/vserver.h +++ b/util-vserver/lib/vserver.h @@ -34,14 +34,14 @@ # define VC_ATTR_UNUSED __attribute__((__unused__)) # define VC_ATTR_NORETURN __attribute__((__noreturn__)) # define VC_ATTR_CONST __attribute__((__const__)) -# if __GNUC__>3 || (__GNUC__==3 && __GNUC_MINOR__>=3) +# if __GNUC__*0x10000 + __GNUC_MINOR__*0x100 + __GNUC_PATCHLEVEL__ >= 0x30300 # define VC_ATTR_NONNULL(ARGS) __attribute__((__nonnull__ ARGS)) # define VC_ATTR_ALWAYSINLINE __attribute__((__always_inline__)) # else # define VC_ATTR_NONNULL(ARGS) # define VC_ATTR_ALWAYSINLINE # endif -# if __GNUC__>3 +# if __GNUC__*0x10000 + __GNUC_MINOR__*0x100 + __GNUC_PATCHLEVEL__ >= 0x30303 # define VC_ATTR_PURE __attribute__((__pure__)) # else # define VC_ATTR_PURE @@ -370,6 +370,7 @@ extern "C" { struct vc_ctx_caps { uint_least64_t bcaps; + uint_least64_t bmask; uint_least64_t ccaps; uint_least64_t cmask; }; @@ -411,7 +412,7 @@ extern "C" { int vc_text2cap(char const *); char const * vc_cap2text(unsigned int); - inline static uint_least32_t vc_get_securecaps() { + inline static uint_least32_t vc_get_insecurecaps() { return ( (1<