upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-09-01 02:34:55 +00:00
Code Activity

obstack: merge better with glibc

Browse Source 
When compiled for glibc, keep the fake array content size at 4,
for API compatibility with older glibc.
* lib/obstack.in.h (__FLEXIBLE_ARRAY_MEMBER): Remove.
(_OBSTACK_CHUNK_CONTENTS_SIZE): New macro.
(struct _obstack_chunk): Use it for contents size.
* modules/obstack (Depends-on): Add flexmember.
This commit is contained in:
Paul Eggert
2025-05-05 14:02:12 -07:00
parent 3f6929c204
commit 65cc87ec8b
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+8
View File
@@ -1,5 +1,13 @@
2025-05-05 Paul Eggert <eggert@cs.ucla.edu>
obstack: merge better with glibc
When compiled for glibc, keep the fake array content size at 4,
for API compatibility with older glibc.
* lib/obstack.in.h (__FLEXIBLE_ARRAY_MEMBER): Remove.
(_OBSTACK_CHUNK_CONTENTS_SIZE): New macro.
(struct _obstack_chunk): Use it for contents size.
* modules/obstack (Depends-on): Add flexmember.
obstack: stop depending on alignof
* lib/obstack.c (__alignof__) [!__GNUC__]:
Default to alignof, not to alignof_type.
lib/obstack.in.h
+4 -9
View File
@@ -106,8 +106,7 @@
#define _OBSTACK_H 1
#if defined __GL_GNULIB_HEADER
/* Gnulib usage. */
/* This file uses _GL_ATTRIBUTE_PURE. */
/* This file uses _GL_ATTRIBUTE_PURE, FLEXIBLE_ARRAY_MEMBER. */
# if !_GL_CONFIG_H_INCLUDED
#error "Please include config.h first."
# endif
@@ -117,12 +116,6 @@
#include <stdint.h> /* For uintptr_t. */
#include <string.h> /* For memcpy. */
#if __STDC_VERSION__ < 199901L || defined __HP_cc
# define __FLEXIBLE_ARRAY_MEMBER 1
#else
# define __FLEXIBLE_ARRAY_MEMBER
#endif
/* These macros highlight the places where this implementation
is different from the one in GNU libc. */
#if defined __GL_GNULIB_HEADER
@@ -130,11 +123,13 @@
# define _OBSTACK_SIZE_T size_t
# define _CHUNK_SIZE_T size_t
# define _OBSTACK_CAST(type, expr) (expr)
# define _OBSTACK_CHUNK_CONTENTS_SIZE FLEXIBLE_ARRAY_MEMBER
#else
/* glibc usage. */
# define _OBSTACK_SIZE_T unsigned int
# define _CHUNK_SIZE_T unsigned long
# define _OBSTACK_CAST(type, expr) ((type) (expr))
# define _OBSTACK_CHUNK_CONTENTS_SIZE 4
#endif
/* __PTR_ALIGN(B, P, A) returns the result of aligning P to the next multiple
@@ -172,7 +167,7 @@ struct _obstack_chunk /* Lives at front of each chunk. */
{
char *limit; /* 1 past end of this chunk */
struct _obstack_chunk *prev; /* address of prior chunk or NULL */
char contents[__FLEXIBLE_ARRAY_MEMBER]; /* objects begin here */
char contents[_OBSTACK_CHUNK_CONTENTS_SIZE]; /* objects begin here */
};
struct obstack /* control current object in current chunk */
modules/obstack
+1
View File
@@ -9,6 +9,7 @@ m4/obstack.m4
Depends-on:
gen-header
alignasof [test $HAVE_OBSTACK = 0 || test $REPLACE_OBSTACK = 1]
flexmember [test $HAVE_OBSTACK = 0 || test $REPLACE_OBSTACK = 1]
gettext-h [test $HAVE_OBSTACK = 0 || test $REPLACE_OBSTACK = 1]
gnulib-i18n [test $HAVE_OBSTACK = 0 || test $REPLACE_OBSTACK = 1]
exitfail [test $HAVE_OBSTACK = 0 || test $REPLACE_OBSTACK = 1]