summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2023-01-28 02:23:36 +0100
committerBruno Haible <bruno@clisp.org>2023-01-28 02:28:49 +0100
commit2c78d1eadedebf5e279fe282aee7e51958f806a6 (patch)
tree057c28c5f59800c92e4d48647fcde35c29622e28 /modules
parentc9dfdba295edbd9d2ae8d8ba441d404f357b6c0e (diff)
downloadgnulib-2c78d1eadedebf5e279fe282aee7e51958f806a6.tar.gz
stdalign: Ensure alignof is defined on FreeBSD (regression 2023-01-15).
* lib/stdalign.in.h: Include the system's <stdalign.h> when it exists. * m4/stdalign.m4 (gl_ALIGNASOF): Invoke gl_CHECK_NEXT_HEADERS. Set HAVE_STDALIGN_H. * modules/stdalign (Makefile.am): Substitute GUARD_PREFIX, HAVE_STDALIGN_H, INCLUDE_NEXT, PRAGMA_SYSTEM_HEADER, PRAGMA_COLUMNS, NEXT_STDALIGN_H.
Diffstat (limited to 'modules')
-rw-r--r--modules/stdalign9
1 files changed, 8 insertions, 1 deletions
diff --git a/modules/stdalign b/modules/stdalign
index c5c29d3088..ceeab546a2 100644
--- a/modules/stdalign
+++ b/modules/stdalign
@@ -26,7 +26,14 @@ BUILT_SOURCES += $(STDALIGN_H)
if GL_GENERATE_STDALIGN_H
stdalign.h: stdalign.in.h $(top_builddir)/config.status
@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%'
- $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/stdalign.in.h
+ $(gl_V_at)$(SED_HEADER_STDOUT) \
+ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+ -e 's|@''HAVE_STDALIGN_H''@|$(HAVE_STDALIGN_H)|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+ -e 's|@''NEXT_STDALIGN_H''@|$(NEXT_STDALIGN_H)|g' \
+ $(srcdir)/stdalign.in.h > $@-t
$(AM_V_at)mv $@-t $@
else
stdalign.h: $(top_builddir)/config.status