From 3f9e15ab18395229c41380f7ccfe37d542288ba0 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 20 Jun 2021 03:14:22 +0200 Subject: unitypes: Fix trouble caused by installed older versions of unitypes.h. * modules/unitypes (configure.ac): Define _UC_RESTRICT through config.h. --- ChangeLog | 5 +++++ modules/unitypes | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/ChangeLog b/ChangeLog index acfdca21a1..a43fcf60c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2021-06-19 Bruno Haible + + unitypes: Fix trouble caused by installed older versions of unitypes.h. + * modules/unitypes (configure.ac): Define _UC_RESTRICT through config.h. + 2021-06-19 Bruno Haible sigsegv, sigsegv-tests: Assign my contributions to the FSF. diff --git a/modules/unitypes b/modules/unitypes index 8d3ccf0c19..46ed80d8c8 100644 --- a/modules/unitypes +++ b/modules/unitypes @@ -11,6 +11,22 @@ stdint configure.ac: gl_LIBUNISTRING_LIBHEADER([0.9.11], [unitypes.h]) +AH_VERBATIM([unitypes_restrict], [ +/* This definition is a duplicate of the one in unitypes.h. + It is here so that we can cope with an older version of unitypes.h + that does not contain this definition and that is pre-installed among + the public header files. */ +# if defined __restrict \ + || 2 < __GNUC__ + (95 <= __GNUC_MINOR__) \ + || __clang_major__ >= 3 +# define _UC_RESTRICT __restrict +# elif 199901L <= __STDC_VERSION__ || defined restrict +# define _UC_RESTRICT restrict +# else +# define _UC_RESTRICT +# endif +]) + Makefile.am: BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H) -- cgit v1.2.1