diff options
| -rw-r--r-- | support/ChangeLog | 4 | ||||
| -rw-r--r-- | support/regex_internal.h | 2 | ||||
| -rw-r--r-- | test/ChangeLog | 4 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 2 |
5 files changed, 11 insertions, 3 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index 5a9f5e93..bf8c8b41 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,7 @@ +2017-10-08 Arnold D. Robbins <arnold@skeeve.com> + + * regex_internal.h: Minor fix from Andreas for OS/2. + 2017-08-27 Juan Manuel Guerrero <juan.guerrero@gmx.de> * localeinfo.c [__DJGPP__]: Include mbsupport.h. diff --git a/support/regex_internal.h b/support/regex_internal.h index 9f4ff070..d4fde40f 100644 --- a/support/regex_internal.h +++ b/support/regex_internal.h @@ -405,7 +405,7 @@ struct re_dfa_t; typedef struct re_dfa_t re_dfa_t; #ifndef _LIBC -# ifdef __i386__ +# if defined( __i386__ ) && !defined(__EMX__) # define internal_function __attribute__ ((regparm (3), stdcall)) # else # define internal_function diff --git a/test/ChangeLog b/test/ChangeLog index eff5ac4e..33d59eee 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2017-10-08 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (randtest): Minor fix from Andreas for OS/2. + 2017-09-14 Andrew J. Schorr <aschorr@telemetry-investments.com> * Makefile.am (nonfatal1): New rule with postprocessing to remove diff --git a/test/Makefile.am b/test/Makefile.am index 1ef33b13..cb17f9d6 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2299,7 +2299,7 @@ dfamb1: randtest:: @echo $@ - @GAWK="$(AWKPROG)" "$(srcdir)"/randtest.sh >_$@ + @-GAWK="$(AWKPROG)" "$(srcdir)"/randtest.sh >_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ backbigs1: diff --git a/test/Makefile.in b/test/Makefile.in index bf91f16b..091927c5 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2737,7 +2737,7 @@ dfamb1: randtest:: @echo $@ - @GAWK="$(AWKPROG)" "$(srcdir)"/randtest.sh >_$@ + @-GAWK="$(AWKPROG)" "$(srcdir)"/randtest.sh >_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ backbigs1: |