diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-06-15 22:43:54 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-06-15 22:43:54 +0300 |
| commit | 13792702809271ab92f67bb71cc3f10731f35047 (patch) | |
| tree | 6cb791ecdfecac6cd501fdbe95d925e8a2c41cb1 /regex_internal.h | |
| parent | 13127e20909b2ef212f5e467c8f3bb447091e4ef (diff) | |
| parent | 3d47e0edfe9dbac583f54cb265063efb9d37fa38 (diff) | |
| download | egawk-13792702809271ab92f67bb71cc3f10731f35047.tar.gz egawk-13792702809271ab92f67bb71cc3f10731f35047.tar.bz2 egawk-13792702809271ab92f67bb71cc3f10731f35047.zip | |
Merge branch 'master' into feature/regex-type
Diffstat (limited to 'regex_internal.h')
| -rw-r--r-- | regex_internal.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/regex_internal.h b/regex_internal.h index 327bd7e0..4d0028ff 100644 --- a/regex_internal.h +++ b/regex_internal.h @@ -148,11 +148,8 @@ is_blank (int c) # define attribute_hidden #endif /* not _LIBC */ -#ifdef __GNUC__ -# define __attribute(arg) __attribute__ (arg) -#else -# define __attribute(arg) -# define __attribute__(arg) /* GAWK: They left this out. Duh. */ +#if __GNUC__ < 3 + (__GNUC_MINOR__ < 1) +# define __attribute__(arg) #endif #ifdef GAWK @@ -803,6 +800,10 @@ re_string_wchar_at (const re_string_t *pstr, int idx) } # ifndef NOT_IN_libc +# ifdef _LIBC +# include <locale/weight.h> +# endif + static int internal_function __attribute__ ((pure, unused)) re_string_elem_size_at (const re_string_t *pstr, int idx) @@ -810,7 +811,6 @@ re_string_elem_size_at (const re_string_t *pstr, int idx) # ifdef _LIBC const unsigned char *p, *extra; const int32_t *table, *indirect; -# include <locale/weight.h> uint_fast32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); if (nrules != 0) |