From b7a807df4473a3d9210aff24a3bcff2479c688a9 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 3 Apr 2021 17:41:18 +0200 Subject: [PATCH] xalloc-die: Fix compilation error (regression from 2021-03-28). * lib/xalloc.h: Don't include idx.h and xalloc-oversized.h if the module 'xalloc' is not in use. * modules/xalloc-die (Depends-on): Remove xalloc-oversized. --- ChangeLog | 7 +++++++ lib/xalloc.h | 6 ++++-- modules/xalloc-die | 1 - 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8b9aec605..4e2edde414 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2021-04-03 Bruno Haible + + xalloc-die: Fix compilation error (regression from 2021-03-28). + * lib/xalloc.h: Don't include idx.h and xalloc-oversized.h if the module + 'xalloc' is not in use. + * modules/xalloc-die (Depends-on): Remove xalloc-oversized. + 2020-04-03 Marc Nieper-Wißkirchen hamt: New module. diff --git a/lib/xalloc.h b/lib/xalloc.h index 5633fdf3c4..6e7de60da9 100644 --- a/lib/xalloc.h +++ b/lib/xalloc.h @@ -21,8 +21,10 @@ #include #include -#include "idx.h" -#include "xalloc-oversized.h" +#if GNULIB_XALLOC +# include "idx.h" +# include "xalloc-oversized.h" +#endif #ifndef _GL_INLINE_HEADER_BEGIN #error "Please include config.h first." diff --git a/modules/xalloc-die b/modules/xalloc-die index f53de5a5ac..e8ef52abe8 100644 --- a/modules/xalloc-die +++ b/modules/xalloc-die @@ -11,7 +11,6 @@ extern-inline gettext-h exitfail stdint -xalloc-oversized configure.ac: gl_MODULE_INDICATOR([xalloc-die]) -- 2.39.5