diff options
Diffstat (limited to 'lib/unistring')
| -rw-r--r-- | lib/unistring/cdefs.h | 40 | ||||
| -rw-r--r-- | lib/unistring/inline.h | 8 | ||||
| -rw-r--r-- | lib/unistring/version.in.h | 5 |
3 files changed, 39 insertions, 14 deletions
diff --git a/lib/unistring/cdefs.h b/lib/unistring/cdefs.h index 3faf5ba8..621235c0 100644 --- a/lib/unistring/cdefs.h +++ b/lib/unistring/cdefs.h @@ -1,5 +1,5 @@ /* Common macro definitions for C include files. - Copyright (C) 2008-2021 Free Software Foundation, Inc. + Copyright (C) 2008-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of either: @@ -74,7 +74,9 @@ #if (defined __has_attribute \ && (!defined __clang_minor__ \ - || 3 < __clang_major__ + (5 <= __clang_minor__))) + || (defined __apple_build_version__ \ + ? 6000000 <= __apple_build_version__ \ + : 5 <= __clang_major__))) # define _UC_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) #else # define _UC_HAS_ATTRIBUTE(attr) _UC_ATTR_##attr @@ -82,10 +84,14 @@ # define _UC_ATTR_unused _UC_GNUC_PREREQ (2, 7) #endif -#ifdef __has_c_attribute -# define _UC_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__) +#ifdef __cplusplus +# if defined __clang__ +# define _UC_BRACKET_BEFORE_ATTRIBUTE 1 +# endif #else -# define _UC_HAS_C_ATTRIBUTE(attr) 0 +# if defined __GNUC__ && !defined __clang__ +# define _UC_BRACKET_BEFORE_ATTRIBUTE 1 +# endif #endif #if _UC_GNUC_PREREQ (11, 0) @@ -93,7 +99,14 @@ #else # define _UC_ATTRIBUTE_DEALLOC(f, i) #endif -#define _UC_ATTRIBUTE_DEALLOC_FREE _UC_ATTRIBUTE_DEALLOC (free, 1) +#if defined __cplusplus && defined __GNUC__ && !defined __clang__ +/* Work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108231> */ +# define _UC_ATTRIBUTE_DEALLOC_FREE \ + _UC_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1) +#else +# define _UC_ATTRIBUTE_DEALLOC_FREE \ + _UC_ATTRIBUTE_DEALLOC (free, 1) +#endif #if _UC_HAS_ATTRIBUTE (malloc) # define _UC_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) @@ -101,9 +114,18 @@ # define _UC_ATTRIBUTE_MALLOC #endif -#if _UC_HAS_C_ATTRIBUTE (maybe_unused) -# define _UC_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] -#else +#ifndef _UC_BRACKET_BEFORE_ATTRIBUTE +# if defined __clang__ && defined __cplusplus +# if !defined __apple_build_version__ && __clang_major__ >= 10 +# define _UC_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +# endif +# elif defined __has_c_attribute +# if __has_c_attribute (__maybe_unused__) +# define _UC_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +# endif +# endif +#endif +#ifndef _UC_ATTRIBUTE_MAYBE_UNUSED # define _UC_ATTRIBUTE_MAYBE_UNUSED _UC_ATTRIBUTE_UNUSED #endif diff --git a/lib/unistring/inline.h b/lib/unistring/inline.h index 4605fbfa..710cf504 100644 --- a/lib/unistring/inline.h +++ b/lib/unistring/inline.h @@ -1,5 +1,5 @@ /* Decision whether to use 'inline' or not. - Copyright (C) 2006, 2009, 2018 Free Software Foundation, Inc. + Copyright (C) 2006-2023 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of either: @@ -40,10 +40,10 @@ equivalent is effectively supported, i.e. if the compiler is likely to drop unused 'static inline' functions. */ -#if defined __GNUC__ -/* GNU C or GNU C++. */ +#if defined __GNUC__ || defined __clang__ +/* GNU C/C++ or clang C/C++. */ # if defined __NO_INLINE__ -/* GCC defines __NO_INLINE__ if not optimizing or if -fno-inline is +/* GCC and clang define __NO_INLINE__ if not optimizing or if -fno-inline is specified. */ # define UNISTRING_HAVE_INLINE 0 # else diff --git a/lib/unistring/version.in.h b/lib/unistring/version.in.h index d35adc6b..2b8264b6 100644 --- a/lib/unistring/version.in.h +++ b/lib/unistring/version.in.h @@ -1,5 +1,5 @@ /* Meta information about GNU libunistring. - Copyright (C) 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2009-2024 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This program is free software: you can redistribute it and/or @@ -30,6 +30,9 @@ /* Get LIBUNISTRING_DLL_VARIABLE. */ #include <unistring/woe32dll.h> +/* Declare _libunistring_unicode_version. */ +#include <unimetadata.h> + #ifdef __cplusplus extern "C" { |