Use __attribute__ ((__name__)) form
Protect against macros named noreturn and so on.
This commit is contained in:

committed by
Viktor Dukhovni

parent
31896397d7
commit
6a0f45c4d7
@@ -68,13 +68,13 @@ RCSID("$Id$");
|
||||
#endif
|
||||
|
||||
static void
|
||||
try_signed(FILE *f, int len) __attribute__ ((unused));
|
||||
try_signed(FILE *f, int len) __attribute__ ((__unused__));
|
||||
|
||||
static void
|
||||
try_unsigned(FILE *f, int len) __attribute__ ((unused));
|
||||
try_unsigned(FILE *f, int len) __attribute__ ((__unused__));
|
||||
|
||||
static int
|
||||
print_bt(FILE *f, int flag) __attribute__ ((unused));
|
||||
print_bt(FILE *f, int flag) __attribute__ ((__unused__));
|
||||
|
||||
static void
|
||||
try_signed(FILE *f, int len)
|
||||
@@ -262,7 +262,7 @@ int main(int argc, char **argv)
|
||||
|
||||
fprintf(f, "#ifndef HEIMDAL_DEPRECATED\n");
|
||||
fprintf(f, "#if __has_extension(deprecated) || KRB5TYPES_REQUIRE_GNUC(3,1,0)\n");
|
||||
fprintf(f, "#define HEIMDAL_DEPRECATED __attribute__((deprecated))\n");
|
||||
fprintf(f, "#define HEIMDAL_DEPRECATED __attribute__ ((__deprecated__))\n");
|
||||
fprintf(f, "#elif defined(_MSC_VER) && (_MSC_VER>1200)\n");
|
||||
fprintf(f, "#define HEIMDAL_DEPRECATED __declspec(deprecated)\n");
|
||||
fprintf(f, "#else\n");
|
||||
@@ -272,7 +272,7 @@ int main(int argc, char **argv)
|
||||
|
||||
fprintf(f, "#ifndef HEIMDAL_PRINTF_ATTRIBUTE\n");
|
||||
fprintf(f, "#if __has_extension(format) || KRB5TYPES_REQUIRE_GNUC(3,1,0)\n");
|
||||
fprintf(f, "#define HEIMDAL_PRINTF_ATTRIBUTE(x) __attribute__((format x))\n");
|
||||
fprintf(f, "#define HEIMDAL_PRINTF_ATTRIBUTE(x) __attribute__ ((__format__ x))\n");
|
||||
fprintf(f, "#else\n");
|
||||
fprintf(f, "#define HEIMDAL_PRINTF_ATTRIBUTE(x)\n");
|
||||
fprintf(f, "#endif\n");
|
||||
@@ -280,7 +280,7 @@ int main(int argc, char **argv)
|
||||
|
||||
fprintf(f, "#ifndef HEIMDAL_NORETURN_ATTRIBUTE\n");
|
||||
fprintf(f, "#if __has_extension(noreturn) || KRB5TYPES_REQUIRE_GNUC(3,1,0)\n");
|
||||
fprintf(f, "#define HEIMDAL_NORETURN_ATTRIBUTE __attribute__((noreturn))\n");
|
||||
fprintf(f, "#define HEIMDAL_NORETURN_ATTRIBUTE __attribute__ ((__noreturn__))\n");
|
||||
fprintf(f, "#else\n");
|
||||
fprintf(f, "#define HEIMDAL_NORETURN_ATTRIBUTE\n");
|
||||
fprintf(f, "#endif\n");
|
||||
@@ -288,7 +288,7 @@ int main(int argc, char **argv)
|
||||
|
||||
fprintf(f, "#ifndef HEIMDAL_UNUSED_ATTRIBUTE\n");
|
||||
fprintf(f, "#if __has_extension(unused) || KRB5TYPES_REQUIRE_GNUC(3,1,0)\n");
|
||||
fprintf(f, "#define HEIMDAL_UNUSED_ATTRIBUTE __attribute__((unused))\n");
|
||||
fprintf(f, "#define HEIMDAL_UNUSED_ATTRIBUTE __attribute__ ((__unused__))\n");
|
||||
fprintf(f, "#else\n");
|
||||
fprintf(f, "#define HEIMDAL_UNUSED_ATTRIBUTE\n");
|
||||
fprintf(f, "#endif\n");
|
||||
@@ -296,7 +296,7 @@ int main(int argc, char **argv)
|
||||
|
||||
fprintf(f, "#ifndef HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE\n");
|
||||
fprintf(f, "#if __has_extension(warn_unused_result) || KRB5TYPES_REQUIRE_GNUC(3,3,0)\n");
|
||||
fprintf(f, "#define HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE __attribute__((warn_unused_result))\n");
|
||||
fprintf(f, "#define HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE __attribute__ ((__warn_unused_result__))\n");
|
||||
fprintf(f, "#else\n");
|
||||
fprintf(f, "#define HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE\n");
|
||||
fprintf(f, "#endif\n");
|
||||
|
@@ -24,7 +24,7 @@ typedef ssize_t krb5_ssize_t;
|
||||
|
||||
#ifndef HEIMDAL_DEPRECATED
|
||||
#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)
|
||||
#define HEIMDAL_DEPRECATED __declspec(deprecated)
|
||||
#else
|
||||
@@ -34,7 +34,7 @@ typedef ssize_t krb5_ssize_t;
|
||||
|
||||
#ifndef HEIMDAL_PRINTF_ATTRIBUTE
|
||||
#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
|
||||
#define HEIMDAL_PRINTF_ATTRIBUTE(x)
|
||||
#endif
|
||||
@@ -42,7 +42,7 @@ typedef ssize_t krb5_ssize_t;
|
||||
|
||||
#ifndef HEIMDAL_NORETURN_ATTRIBUTE
|
||||
#if __has_extension(noreturn) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
|
||||
#define HEIMDAL_NORETURN_ATTRIBUTE __attribute__((noreturn))
|
||||
#define HEIMDAL_NORETURN_ATTRIBUTE __attribute__ ((__noreturn__))
|
||||
#else
|
||||
#define HEIMDAL_NORETURN_ATTRIBUTE
|
||||
#endif
|
||||
@@ -50,7 +50,7 @@ typedef ssize_t krb5_ssize_t;
|
||||
|
||||
#ifndef HEIMDAL_UNUSED_ATTRIBUTE
|
||||
#if __has_extension(unused) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
|
||||
#define HEIMDAL_UNUSED_ATTRIBUTE __attribute__((unused))
|
||||
#define HEIMDAL_UNUSED_ATTRIBUTE __attribute__ ((__unused__))
|
||||
#else
|
||||
#define HEIMDAL_UNUSED_ATTRIBUTE
|
||||
#endif
|
||||
@@ -58,7 +58,7 @@ typedef ssize_t krb5_ssize_t;
|
||||
|
||||
#ifndef HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE
|
||||
#if __has_extension(__warn_unused_result__) || KRB5TYPES_REQUIRE_GNUC(3,3,0)
|
||||
#define HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE __attribute__((__warn_unused_result__))
|
||||
#define HEIMDAL_WARN_UNUSED_RESULT_ATTRIBUTE __attribute__ ((__warn_unused_result__))
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user