diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2017-12-01 13:56:50 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2017-12-01 13:56:50 +0200 |
| commit | fb44529bfa05b9c05cc2edd49566db1b3a37ca54 (patch) | |
| tree | 4bf738ec4099eee1dbb0619c044923e88dba8017 | |
| parent | ac018ace5fc53299a91d7dcc3e442ef017f4c3af (diff) | |
| download | egawk-fb44529bfa05b9c05cc2edd49566db1b3a37ca54.tar.gz egawk-fb44529bfa05b9c05cc2edd49566db1b3a37ca54.tar.bz2 egawk-fb44529bfa05b9c05cc2edd49566db1b3a37ca54.zip | |
Small updates in support routines.
| -rw-r--r-- | support/ChangeLog | 6 | ||||
| -rw-r--r-- | support/intprops.h | 8 | ||||
| -rw-r--r-- | support/regcomp.c | 2 | ||||
| -rw-r--r-- | support/regex.h | 4 |
4 files changed, 11 insertions, 9 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index f7b450c2..a4520ece 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,9 @@ +2017-12-01 Arnold D. Robbins <arnold@skeeve.com> + + * intprops.h: Sync with GNULIB. + * regcomp.c (init_word): Move general_case label inside ifdef. + * regex.h: Don't define __USE_GNU. Brings closer to GLIBC regex. + 2017-11-26 Arnold D. Robbins <arnold@skeeve.com> * regcomp.c regex_internal.c, regex_internal.h, regexec.c: Sync diff --git a/support/intprops.h b/support/intprops.h index 33a7ec5a..fd6d9268 100644 --- a/support/intprops.h +++ b/support/intprops.h @@ -13,7 +13,7 @@ GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ + along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* Written by Paul Eggert. */ @@ -26,7 +26,7 @@ #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) /* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see - <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00406.html>. */ + <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00406.html>. */ #define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v)) /* The extra casts in the following macros work around compiler bugs, @@ -179,7 +179,7 @@ /* Return 1 if A * B would overflow in [MIN,MAX] arithmetic. See above for restrictions. Avoid && and || as they tickle bugs in Sun C 5.11 2010/08/13 and other compilers; see - <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00401.html>. */ + <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00401.html>. */ #define INT_MULTIPLY_RANGE_OVERFLOW(a, b, min, max) \ ((b) < 0 \ ? ((a) < 0 \ @@ -443,7 +443,7 @@ implementation-defined result or signal for values outside T's range. However, code that works around this theoretical problem runs afoul of a compiler bug in Oracle Studio 12.3 x86. See: - http://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00049.html + https://lists.gnu.org/r/bug-gnulib/2017-04/msg00049.html As the compiler bug is real, don't try to work around the theoretical problem. */ diff --git a/support/regcomp.c b/support/regcomp.c index 2b662edb..4fca1108 100644 --- a/support/regcomp.c +++ b/support/regcomp.c @@ -999,9 +999,9 @@ init_word_char (re_dfa_t *dfa) return; } } -#endif general_case: +#endif for (; i < BITSET_WORDS; ++i) for (int j = 0; j < BITSET_WORD_BITS; ++j, ++ch) if (isalnum (ch) || ch == '_') diff --git a/support/regex.h b/support/regex.h index adddd9ee..1bbbb26c 100644 --- a/support/regex.h +++ b/support/regex.h @@ -28,10 +28,6 @@ #include <sys/types.h> #endif -#ifndef _LIBC -#define __USE_GNU 1 -#endif - /* Allow the use in C++ code. */ #ifdef __cplusplus extern "C" { |