diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2019-01-11 15:09:49 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2019-01-11 15:09:49 +0200 |
| commit | feebb01f31e29740b050da1531416c90a12352ca (patch) | |
| tree | b693ec44973e3a6566213b9e01ddb83db619c732 /support | |
| parent | 56f4a4139ad7e81064e25887f959a4a6e5e54a58 (diff) | |
| parent | 3d0561d7546022605687802d19c5effcf89d7172 (diff) | |
| download | egawk-feebb01f31e29740b050da1531416c90a12352ca.tar.gz egawk-feebb01f31e29740b050da1531416c90a12352ca.tar.bz2 egawk-feebb01f31e29740b050da1531416c90a12352ca.zip | |
Merge branch 'gawk-4.2-stable'
Diffstat (limited to 'support')
| -rw-r--r-- | support/ChangeLog | 5 | ||||
| -rw-r--r-- | support/cdefs.h | 4 | ||||
| -rw-r--r-- | support/xalloc.h | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index 1cc4410f..9e0ffe71 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,8 @@ +2019-01-09 John E. Malmberg <wb8tyw@qsl.net> + + * cdefs.h, xalloc.h: For non GCC, have + __attribute__ definition match regex_internal.h exactly. + 2018-12-26 Arnold D. Robbins <arnold@skeeve.com> In a spirit of depressed resignation, synced regex diff --git a/support/cdefs.h b/support/cdefs.h index 26e2f3fe..b616e195 100644 --- a/support/cdefs.h +++ b/support/cdefs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2018 Free Software Foundation, Inc. +/* Copyright (C) 1992-2019 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -198,7 +198,7 @@ `__attribute__' syntax. All of the ways we use this do fine if they are omitted for compilers that don't understand it. */ #if !defined __GNUC__ || __GNUC__ < 2 -# define __attribute__(xyz) /* Ignore */ +# define __attribute__(arg) /* Ignore */ #endif /* At some point during the gcc 2.96 development the `malloc' attribute diff --git a/support/xalloc.h b/support/xalloc.h index 89dbe2c1..f238bb79 100644 --- a/support/xalloc.h +++ b/support/xalloc.h @@ -1,8 +1,8 @@ /* xalloc.h -- malloc with out-of-memory checking Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2003, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, - Inc. + 2000, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2019 + Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ extern "C" { # ifndef __attribute__ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) -# define __attribute__(x) +# define __attribute__(arg) # endif # endif |