zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check for alloc_size attribute in configure.ac

This commit is contained in:
Benny Baumann 2021-06-27 12:44:01 +02:00 committed by BenBE
parent 3da142b4b6
commit 44d1200ca4
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Macros.h
View File

@ -37,8 +37,6 @@
#define ATTR_NONNULL __attribute__((nonnull)) #define ATTR_NONNULL __attribute__((nonnull))
#define ATTR_NORETURN __attribute__((noreturn)) #define ATTR_NORETURN __attribute__((noreturn))
#define ATTR_UNUSED __attribute__((unused)) #define ATTR_UNUSED __attribute__((unused))
#define ATTR_ALLOC_SIZE1(a) __attribute__((alloc_size (a)))
#define ATTR_ALLOC_SIZE2(a, b) __attribute__((alloc_size (a, b)))
#define ATTR_MALLOC __attribute__((malloc)) #define ATTR_MALLOC __attribute__((malloc))
#else /* __GNUC__ */ #else /* __GNUC__ */
@ -47,12 +45,22 @@
#define ATTR_NONNULL #define ATTR_NONNULL
#define ATTR_NORETURN #define ATTR_NORETURN
#define ATTR_UNUSED #define ATTR_UNUSED
#define ATTR_ALLOC_SIZE1(a)
#define ATTR_ALLOC_SIZE2(a, b)
#define ATTR_MALLOC #define ATTR_MALLOC
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#ifdef HAVE_ATTR_ALLOC_SIZE
#define ATTR_ALLOC_SIZE1(a) __attribute__((alloc_size (a)))
#define ATTR_ALLOC_SIZE2(a, b) __attribute__((alloc_size (a, b)))
#else
#define ATTR_ALLOC_SIZE1(a)
#define ATTR_ALLOC_SIZE2(a, b)
#endif /* HAVE_ATTR_ALLOC_SIZE */
// ignore casts discarding const specifier, e.g. // ignore casts discarding const specifier, e.g.
// const char [] -> char * / void * // const char [] -> char * / void *
// const char *[2]' -> char *const * // const char *[2]' -> char *const *

14
configure.ac
View File

@ -173,6 +173,20 @@ AC_TYPE_UINT16_T
AC_TYPE_UINT32_T AC_TYPE_UINT32_T
AC_TYPE_UINT64_T AC_TYPE_UINT64_T
AC_MSG_CHECKING(for alloc_size)
old_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Wno-error -Werror=attributes"
AC_COMPILE_IFELSE([
AC_LANG_SOURCE(
[
__attribute__((alloc_size(1))) char* my_alloc(int size) { return 0; }
],[]
)],
AC_DEFINE([HAVE_ATTR_ALLOC_SIZE], 1, [The alloc_size attribute is supported.])
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
CFLAGS="$old_CFLAGS"
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------