diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2017-10-08 15:31:40 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2017-10-08 15:31:40 +0300 |
| commit | e31035566237ea84dd5a8d9b7b9541934c15615f (patch) | |
| tree | 1e63b8c64bfa03988a3ccffb37583694e987445d /support | |
| parent | a82d79a2f47736fb109625a434b532288ccd9c24 (diff) | |
| parent | b229671fa91db3bc2354c2f000a8155d32a9f117 (diff) | |
| download | egawk-e31035566237ea84dd5a8d9b7b9541934c15615f.tar.gz egawk-e31035566237ea84dd5a8d9b7b9541934c15615f.tar.bz2 egawk-e31035566237ea84dd5a8d9b7b9541934c15615f.zip | |
Merge branch 'master' into feature/dev-5.0
Diffstat (limited to 'support')
| -rw-r--r-- | support/ChangeLog | 4 | ||||
| -rw-r--r-- | support/regex_internal.h | 2 |
2 files changed, 5 insertions, 1 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 |