diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2021-04-23 11:42:24 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2021-04-23 11:42:24 +0300 |
| commit | 26cd77bdc2735d62eb664291dc9912dbaaa78c2c (patch) | |
| tree | b1edcee049952fa61f72e277a224775cccab51e7 /support | |
| parent | 1d13100417c33bb36afae0c5972a456d183f0b49 (diff) | |
| parent | 7caf36ac33e0ffa29e2787084c04ce1dc0878b38 (diff) | |
| download | egawk-26cd77bdc2735d62eb664291dc9912dbaaa78c2c.tar.gz egawk-26cd77bdc2735d62eb664291dc9912dbaaa78c2c.tar.bz2 egawk-26cd77bdc2735d62eb664291dc9912dbaaa78c2c.zip | |
Merge branch 'master' into feature/bool
Diffstat (limited to 'support')
| -rw-r--r-- | support/ChangeLog | 7 | ||||
| -rw-r--r-- | support/dynarray.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index 7050d5e0..54f51fcc 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,10 @@ +2021-04-22 Arnold D. Robbins <arnold@skeeve.com> + + * dynarray.h: Don't redefine libc interfaces to gnulib + interfaces. Needed on at least one Ubuntu 18.04 system, don't + know why, when on other such systems things work. GLIBC + is a swamp. Sigh. + 2021-04-21 Arnold D. Robbins <arnold@skeeve.com> Don't depend upon GLIBC private interfaces. Thanks to diff --git a/support/dynarray.h b/support/dynarray.h index 9a8d3956..ba2bc2ed 100644 --- a/support/dynarray.h +++ b/support/dynarray.h @@ -248,12 +248,14 @@ static DYNARRAY_ELEMENT * /* The implementation is imported from glibc. */ +#ifndef GAWK /* Avoid possible conflicts with symbols exported by the GNU libc. */ #define __libc_dynarray_at_failure gl_dynarray_at_failure #define __libc_dynarray_emplace_enlarge gl_dynarray_emplace_enlarge #define __libc_dynarray_finalize gl_dynarray_finalize #define __libc_dynarray_resize_clear gl_dynarray_resize_clear #define __libc_dynarray_resize gl_dynarray_resize +#endif #if defined DYNARRAY_STRUCT || defined DYNARRAY_ELEMENT || defined DYNARRAY_PREFIX |