diff options
| author | Tim Rühsen <tim.ruehsen@gmx.de> | 2019-06-03 21:53:05 +0200 |
|---|---|---|
| committer | Tim Rühsen <tim.ruehsen@gmx.de> | 2019-06-04 10:37:27 +0200 |
| commit | 28f99ec66419477cc23481caf7fb54ee9ec093bf (patch) | |
| tree | 3124c92127498081bb3941113c57eccdbf11cb8b | |
| parent | a050ec0c0d97335864e8e315e6d628dd7c4c3d10 (diff) | |
| download | gnutls-28f99ec66419477cc23481caf7fb54ee9ec093bf.tar.gz | |
Prefix gcc attributes with 'attr_'tmp-fix-travis2
Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
| -rw-r--r-- | lib/datum.h | 8 | ||||
| -rw-r--r-- | lib/gnutls_int.h | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/datum.h b/lib/datum.h index fe847359b0..3d86a0dc72 100644 --- a/lib/datum.h +++ b/lib/datum.h @@ -28,13 +28,13 @@ /* This will copy the provided data in @dat. If the provided data are * NULL or zero-size @dat will be NULL as well. */ -warn_unused_result nonnull((1)) +attr_warn_unused_result attr_nonnull((1)) int _gnutls_set_datum(gnutls_datum_t * dat, const void *data, size_t data_size); /* This will always return a non-NULL, and zero-terminated string in @dat. */ -warn_unused_result nonnull((1)) +attr_warn_unused_result attr_nonnull((1)) int _gnutls_set_strdatum(gnutls_datum_t * dat, const void *data, size_t data_size); @@ -48,7 +48,7 @@ void _gnutls_free_datum(gnutls_datum_t * dat) } } -inline static nonnull_all +inline static attr_nonnull_all void _gnutls_free_temp_key_datum(gnutls_datum_t * dat) { if (dat->data != NULL) { @@ -59,7 +59,7 @@ void _gnutls_free_temp_key_datum(gnutls_datum_t * dat) dat->size = 0; } -inline static nonnull_all +inline static attr_nonnull_all void _gnutls_free_key_datum(gnutls_datum_t * dat) { if (dat->data != NULL) { diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h index f5a6477852..179d71b4a1 100644 --- a/lib/gnutls_int.h +++ b/lib/gnutls_int.h @@ -77,21 +77,21 @@ typedef int ssize_t; #endif #if _GNUTLS_GCC_VERSION >= 30300 -# define nonnull_all __attribute__ ((nonnull)) -# define nonnull(a) __attribute__ ((nonnull a)) +# define attr_nonnull_all __attribute__ ((nonnull)) +# define attr_nonnull(a) __attribute__ ((nonnull a)) #else -# define G_GNUC_WGET_NONNULL_ALL -# define G_GNUC_WGET_NONNULL(a) +# define attr_nonnull_all +# define attr_nonnull(a) #endif #if _GNUTLS_GCC_VERSION >= 30400 && (_GNUTLS_CLANG_VERSION == 0 || _GNUTLS_CLANG_VERSION >= 40000) -# define warn_unused_result __attribute__((warn_unused_result)) +# define attr_warn_unused_result __attribute__((warn_unused_result)) #else -# define warn_unused_result +# define attr_warn_unused_result #endif #if _GNUTLS_GCC_VERSION >= 70100 -# define FALLTHROUGH __attribute__ ((fallthrough)) +# define FALLTHROUGH __attribute__ ((fallthrough)) #else # define FALLTHROUGH #endif |