>From ba153ed1edb23bf14f21b9892ff169f10d39911f Mon Sep 17 00:00:00 2001
From: Bruno Haible <address@hidden>
Date: Sat, 18 Aug 2018 21:35:11 +0200
Subject: [PATCH 2/3] scratch_buffer: Fix include file.

Reported by Reuben Thomas <address@hidden> in
<https://lists.gnu.org/archive/html/bug-gnulib/2018-08/msg00082.html>.

* lib/scratch_buffer.h: Include <libc-config.h> first. Add
double-inclusion guard.
---
 ChangeLog            | 8 ++++++++
 lib/scratch_buffer.h | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 973abae..000eb2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2018-08-18  Bruno Haible  <address@hidden>
 
+	scratch_buffer: Fix include file.
+	Reported by Reuben Thomas <address@hidden> in
+	<https://lists.gnu.org/archive/html/bug-gnulib/2018-08/msg00082.html>.
+	* lib/scratch_buffer.h: Include <libc-config.h> first. Add
+	double-inclusion guard.
+
+2018-08-18  Bruno Haible  <address@hidden>
+
 	glob-h: Revert Paul Eggert's revert.
 	* m4/glob_h.m4: Revert to previous state.
 	* modules/glob-h: Likewise.
diff --git a/lib/scratch_buffer.h b/lib/scratch_buffer.h
index 52f0ed6..4c0db3e 100644
--- a/lib/scratch_buffer.h
+++ b/lib/scratch_buffer.h
@@ -1,4 +1,11 @@
+#ifndef _GL_SCRATCH_BUFFER_H
+#define _GL_SCRATCH_BUFFER_H
+
+#include <libc-config.h>
+
 #define __libc_scratch_buffer_grow gl_scratch_buffer_grow
 #define __libc_scratch_buffer_grow_preserve gl_scratch_buffer_grow_preserve
 #define __libc_scratch_buffer_set_array_size gl_scratch_buffer_set_array_size
 #include <malloc/scratch_buffer.h>
+
+#endif /* _GL_SCRATCH_BUFFER_H */
-- 
2.7.4