oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

simplify checking and start to use __has_extension

Browse Source
This commit is contained in:
Love Hörnquist Åstrand
2011-06-19 10:43:12 -07:00
parent 4337582a64
commit e5eb401fcd
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/krb5-types.cross
View File

@@ -13,8 +13,17 @@ typedef socklen_t krb5_socklen_t;
#include <unistd.h> #include <unistd.h>
typedef ssize_t krb5_ssize_t; typedef ssize_t krb5_ssize_t;
#if !defined(__has_extension)
#define __has_extension(x) 0
#endif
#define KRB5TYPES_REQUIRE_GNUC(m,n,p) \
(((__GNUC__ * 10000) + (__GNUC_MINOR__ * 100) + __GNUC_PATCHLEVEL__) >= \
(((m) * 10000) + ((n) * 100) + (p)))
#ifndef HEIMDAL_DEPRECATED #ifndef HEIMDAL_DEPRECATED
#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 ))) #if __has_extension(deprecated) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
#define HEIMDAL_DEPRECATED __attribute__((deprecated)) #define HEIMDAL_DEPRECATED __attribute__((deprecated))
#elif defined(_MSC_VER) && (_MSC_VER>1200) #elif defined(_MSC_VER) && (_MSC_VER>1200)
#define HEIMDAL_DEPRECATED __declspec(deprecated) #define HEIMDAL_DEPRECATED __declspec(deprecated)
@@ -24,7 +33,7 @@ typedef ssize_t krb5_ssize_t;
#endif #endif
#ifndef HEIMDAL_PRINTF_ATTRIBUTE #ifndef HEIMDAL_PRINTF_ATTRIBUTE
#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 ))) #if __has_extension(format) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
#define HEIMDAL_PRINTF_ATTRIBUTE(x) __attribute__((format x)) #define HEIMDAL_PRINTF_ATTRIBUTE(x) __attribute__((format x))
#else #else
#define HEIMDAL_PRINTF_ATTRIBUTE(x) #define HEIMDAL_PRINTF_ATTRIBUTE(x)
@@ -32,7 +41,7 @@ typedef ssize_t krb5_ssize_t;
#endif #endif
#ifndef HEIMDAL_NORETURN_ATTRIBUTE #ifndef HEIMDAL_NORETURN_ATTRIBUTE
#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 ))) #if __has_extension(noreturn) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
#define HEIMDAL_NORETURN_ATTRIBUTE __attribute__((noreturn)) #define HEIMDAL_NORETURN_ATTRIBUTE __attribute__((noreturn))
#else #else
#define HEIMDAL_NORETURN_ATTRIBUTE #define HEIMDAL_NORETURN_ATTRIBUTE
@@ -40,7 +49,7 @@ typedef ssize_t krb5_ssize_t;
#endif #endif
#ifndef HEIMDAL_UNUSED_ATTRIBUTE #ifndef HEIMDAL_UNUSED_ATTRIBUTE
#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 ))) #if __has_extension(unused) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
#define HEIMDAL_UNUSED_ATTRIBUTE __attribute__((unused)) #define HEIMDAL_UNUSED_ATTRIBUTE __attribute__((unused))
#else #else
#define HEIMDAL_UNUSED_ATTRIBUTE #define HEIMDAL_UNUSED_ATTRIBUTE