func_attr.h: use NVIM_HAS_ATTRIBUTE

This commit is contained in:
Justin M. Keyes
2017-05-13 01:22:53 +02:00
parent 8d98780932
commit c77c54f1bc

View File

@@ -41,6 +41,8 @@
// $ gcc -E -dM - </dev/null // $ gcc -E -dM - </dev/null
// $ echo | clang -dM -E - // $ echo | clang -dM -E -
#include "nvim/macros.h"
#ifdef FUNC_ATTR_MALLOC #ifdef FUNC_ATTR_MALLOC
# undef FUNC_ATTR_MALLOC # undef FUNC_ATTR_MALLOC
#endif #endif
@@ -96,8 +98,7 @@
#ifndef DID_REAL_ATTR #ifndef DID_REAL_ATTR
# define DID_REAL_ATTR # define DID_REAL_ATTR
# ifdef __GNUC__ # ifdef __GNUC__
// place defines for all gnulikes here, for now that's gcc, clang and // For all gnulikes: gcc, clang, intel.
// intel.
// place these after the argument list of the function declaration // place these after the argument list of the function declaration
// (not definition), like so: // (not definition), like so:
@@ -113,29 +114,17 @@
# define REAL_FATTR_NONNULL_ARG(...) __attribute__((nonnull(__VA_ARGS__))) # define REAL_FATTR_NONNULL_ARG(...) __attribute__((nonnull(__VA_ARGS__)))
# define REAL_FATTR_NORETURN __attribute__((noreturn)) # define REAL_FATTR_NORETURN __attribute__((noreturn))
# if defined(__clang__) && __clang__ == 1 # if NVIM_HAS_ATTRIBUTE(returns_nonnull)
// clang
# if (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 7))
# define REAL_FATTR_NONNULL_RET __attribute__((returns_nonnull)) # define REAL_FATTR_NONNULL_RET __attribute__((returns_nonnull))
# endif # endif
# elif defined(__INTEL_COMPILER)
// intel compiler # if NVIM_HAS_ATTRIBUTE(alloc_size)
# else
# define GCC_VERSION \
(__GNUC__ * 10000 + \
__GNUC_MINOR__ * 100 + \
__GNUC_PATCHLEVEL__)
// gcc
# define REAL_FATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x))) # define REAL_FATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
# define REAL_FATTR_ALLOC_SIZE_PROD(x, y) __attribute__((alloc_size(x, y))) # define REAL_FATTR_ALLOC_SIZE_PROD(x, y) __attribute__((alloc_size(x, y)))
# if GCC_VERSION >= 40900
# define REAL_FATTR_NONNULL_RET __attribute__((returns_nonnull))
# endif
# endif # endif
# endif # endif
// define function attributes that haven't been defined for this specific // Define attributes that are not defined for this compiler.
// compiler.
# ifndef REAL_FATTR_MALLOC # ifndef REAL_FATTR_MALLOC
# define REAL_FATTR_MALLOC # define REAL_FATTR_MALLOC