]> Savannah Git Hosting - gnulib.git/commitdiff
xalloc-die: Fix compilation error (regression from 2021-03-28).
authorBruno Haible <bruno@clisp.org>
Sat, 3 Apr 2021 15:41:18 +0000 (17:41 +0200)
committerBruno Haible <bruno@clisp.org>
Sat, 3 Apr 2021 16:30:28 +0000 (18:30 +0200)
* 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
lib/xalloc.h
modules/xalloc-die

index a8b9aec6059b6e6c7baa482ffc0a223f8da92573..4e2edde41422dacf773786a3e2ec82500aee5b9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2021-04-03  Bruno Haible  <bruno@clisp.org>
+
+       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  <marc@nieper-wisskirchen.de>
 
        hamt: New module.
index 5633fdf3c43e26a327c64db45c9bf6f7f169d7e0..6e7de60da9faec6df8fad990c1dd04ff6346f22a 100644 (file)
 #include <stddef.h>
 #include <stdint.h>
 
-#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."
index f53de5a5ac787d1b3f5d336b9bac1ceb566f97be..e8ef52abe8b278ea75bb5dc1844d7908aa47e26d 100644 (file)
@@ -11,7 +11,6 @@ extern-inline
 gettext-h
 exitfail
 stdint
-xalloc-oversized
 
 configure.ac:
 gl_MODULE_INDICATOR([xalloc-die])