diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2017-08-30 21:18:12 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2017-08-30 21:18:12 +0300 |
| commit | 372ecb0475ac991ceb3a9e00073e753826cafb06 (patch) | |
| tree | 17070bf84d973f4a0c80c6064d9f68115a501a03 /extension | |
| parent | e3d10b231e20e64c673556d3ed4eb96dbe8bbff3 (diff) | |
| parent | 7bc973537c24b1a694147822385bf2f2e0908b27 (diff) | |
| download | egawk-372ecb0475ac991ceb3a9e00073e753826cafb06.tar.gz egawk-372ecb0475ac991ceb3a9e00073e753826cafb06.tar.bz2 egawk-372ecb0475ac991ceb3a9e00073e753826cafb06.zip | |
Merge branch 'master' into feature/fix-comments
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/ChangeLog | 6 | ||||
| -rw-r--r-- | extension/fnmatch.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index 546006ff..613479e1 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,9 @@ +2017-08-30 Arnold D. Robbins <arnold@skeeve.com> + + * fnmatch.c: Use the right autoconf goop to get the major + and minor macros out of <sys/sysmacros.h>. Thanks to + David Kaspar <dkaspar@redhat.com> for the report. + 2017-08-21 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (ntdiv_la_LIBADD): Add -lm for Solaris systems, diff --git a/extension/fnmatch.c b/extension/fnmatch.c index 5382e4bc..9b7640de 100644 --- a/extension/fnmatch.c +++ b/extension/fnmatch.c @@ -39,6 +39,12 @@ #include <sys/types.h> #include <sys/stat.h> +#ifdef MAJOR_IN_MKDEV +#include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +#include <sys/sysmacros.h> +#endif + #include "gawkapi.h" #include "gettext.h" |