diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2016-01-22 08:29:25 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2016-01-22 08:29:25 +0200 |
| commit | be891c3ac7cd31419cfc42cc98082a64766b1bf8 (patch) | |
| tree | dd758489ea60a0b022eae9472835a0cef68a6ed6 | |
| parent | ffe5d1731eca9dd68fd657d5f21a221a200fd37e (diff) | |
| parent | 2949f4b38cc7ecc14dfca32cbb719e43e95aa940 (diff) | |
| download | egawk-be891c3ac7cd31419cfc42cc98082a64766b1bf8.tar.gz egawk-be891c3ac7cd31419cfc42cc98082a64766b1bf8.tar.bz2 egawk-be891c3ac7cd31419cfc42cc98082a64766b1bf8.zip | |
Merge branch 'gawk-4.1-stable'
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | regex_internal.h | 4 | ||||
| -rw-r--r-- | regexec.c | 4 | ||||
| -rw-r--r-- | vms/ChangeLog | 5 | ||||
| -rw-r--r-- | vms/descrip.mms | 4 | ||||
| -rw-r--r-- | vms/vmsbuild.com | 18 |
6 files changed, 17 insertions, 27 deletions
@@ -1,3 +1,12 @@ +2016-01-22 Arnold D. Robbins <arnold@skeeve.com> + + * regexec.c (prune_impossible_nodes): Remove all attributes, on + both declaration and definition. Fixes a Linux Mint 17 compilation + braino reported by Antonio Colombo. + * regex_internal.h (test_malloc): Add cast to silence a warning + on the same system. + (test_realloc): Ditto. + 2016-01-20 Arnold D. Robbins <arnold@skeeve.com> * regex_internal.h [attribute_hidden]: Remove definition. diff --git a/regex_internal.h b/regex_internal.h index ff26be7b..28b4239e 100644 --- a/regex_internal.h +++ b/regex_internal.h @@ -471,7 +471,7 @@ test_malloc(size_t count, const char *file, size_t line) { if (count == 0) { fprintf(stderr, "%s:%lu: allocation of zero bytes\n", - file, line); + file, (unsigned long) line); exit(1); } return malloc(count); @@ -482,7 +482,7 @@ test_realloc(void *p, size_t count, const char *file, size_t line) { if (count == 0) { fprintf(stderr, "%s:%lu: reallocation of zero bytes\n", - file, line); + file, (unsigned long) line); exit(1); } return realloc(p, count); @@ -55,8 +55,7 @@ static int re_search_stub (struct re_pattern_buffer *bufp, int ret_len) internal_function; static unsigned re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, int nregs, int regs_allocated) internal_function; -static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx) - internal_function; +static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx); static int check_matching (re_match_context_t *mctx, int fl_longest_match, int *p_match_first) internal_function; static int check_halt_state_context (const re_match_context_t *mctx, @@ -963,7 +962,6 @@ re_search_internal (preg, string, length, start, range, stop, nmatch, pmatch, } static reg_errcode_t -__attribute_warn_unused_result__ prune_impossible_nodes (re_match_context_t *mctx) { const re_dfa_t *const dfa = mctx->dfa; diff --git a/vms/ChangeLog b/vms/ChangeLog index 7f9dc798..d2f84fe6 100644 --- a/vms/ChangeLog +++ b/vms/ChangeLog @@ -1,3 +1,8 @@ +2016-01-21 John E. Malmberg <wb8tyw@qsl.net> + + * descrip.mms and vmsbuild.com: Remove the unused hand-updated + version numbers. + 2016-01-10 John E. Malmberg <wb8tyw@qsl.net> * build_gawk_pcsi_desc.com: Better detection for VMS Software diff --git a/vms/descrip.mms b/vms/descrip.mms index 8b04e7f8..03edab73 100644 --- a/vms/descrip.mms +++ b/vms/descrip.mms @@ -120,10 +120,6 @@ VMSOBJS = $(VMSCODE),$(VMSCMD) DOCS= $(DOCDIR)gawk.1,$(DOCDIR)gawk.texi,$(DOCDIR)texinfo.tex -# Release of gawk -REL=4.1 -PATCHLVL=3 - # generic target all : gawk @ $(NOOP) diff --git a/vms/vmsbuild.com b/vms/vmsbuild.com index a43039ef..984b83f0 100644 --- a/vms/vmsbuild.com +++ b/vms/vmsbuild.com @@ -1,22 +1,4 @@ $! vmsbuild.com -- Commands to build GAWK Pat Rankin, Dec'89 -$! revised, Mar'90 -$! gawk 2.13 revised, Jun'91 -$! gawk 2.14 revised, Sep'92 -$! gawk 2.15 revised, Oct'93 -$! gawk 3.0 revised, Dec'95 -$! gawk 3.0.1 revised, Nov'96 -$! gawk 3.1.0 revised, Mar'01 -$! gawk 3.1.1 revised, Apr'02 -$! gawk 3.1.6 revised, Mar'07 -$! gawk-bytecode revd, Jan'10 -$! gawk 4.0.0 revd, May'11 -$! gawk 4.1.0 revd, May'13 -$! gawk 4.1.1 revd, Apr'14 -$! gawk 4.1.2 revd, Apr'15 -$! gawk 4.1.3 revd, May'15 -$! -$ REL = "4.1" !release version number -$ PATCHLVL = "3" $! $ if (f$getsyi("HW_MODEL") .lt. 1024) $ then |