about summary refs log tree commit diff
path: root/malloc/scratch_buffer_grow_preserve.c
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-09-04 16:44:12 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-09-08 15:51:34 +0200
commite00f2425996829632de5abff88bc1797558ce92e (patch)
treeeae9e3fa6942c533535a7ad704447f6a32c2a590 /malloc/scratch_buffer_grow_preserve.c
parent5554304f0dddf75dc27cc6250fc53355161fd16a (diff)
downloadglibc-e00f2425996829632de5abff88bc1797558ce92e.tar.gz
glibc-e00f2425996829632de5abff88bc1797558ce92e.tar.xz
glibc-e00f2425996829632de5abff88bc1797558ce92e.zip
Sync scratch_buffer with gnulib
This patch syncs the scratch_buffer grom gnulib commit 3866ef6 with
GLIBC code.

Checked on x86_64-linux-gnu and on a build using build-many-glibcs.py
for all major architectures.

	* include/scratch_buffer.h (scratch_buffer): Use a C99 align method
	instead of GCC extension.
	* malloc/scratch_buffer_grow.c [!_LIBC]: Include libc-config.h.
	* malloc/scratch_buffer_grow_preserve.c [!_LIBC]: Likewise.
	* malloc/scratch_buffer_set_array_size.c [!_LIBC]: Likewise.
Diffstat (limited to 'malloc/scratch_buffer_grow_preserve.c')
-rw-r--r--malloc/scratch_buffer_grow_preserve.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/malloc/scratch_buffer_grow_preserve.c b/malloc/scratch_buffer_grow_preserve.c
index 18543ef85b..9268615311 100644
--- a/malloc/scratch_buffer_grow_preserve.c
+++ b/malloc/scratch_buffer_grow_preserve.c
@@ -16,6 +16,10 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#ifndef _LIBC
+# include <libc-config.h>
+#endif
+
 #include <scratch_buffer.h>
 #include <errno.h>
 #include <string.h>
@@ -60,4 +64,4 @@ __libc_scratch_buffer_grow_preserve (struct scratch_buffer *buffer)
   buffer->length = new_length;
   return true;
 }
-libc_hidden_def (__libc_scratch_buffer_grow_preserve);
+libc_hidden_def (__libc_scratch_buffer_grow_preserve)