From 8d5656873bcc35003371334353c43c25d6673fb9 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Mon, 26 Aug 2013 19:08:10 +0300 Subject: Sync regex with GLIBC. --- regex_internal.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'regex_internal.h') diff --git a/regex_internal.h b/regex_internal.h index f7616fd6..45a69655 100644 --- a/regex_internal.h +++ b/regex_internal.h @@ -417,7 +417,7 @@ typedef struct re_dfa_t re_dfa_t; #ifndef _LIBC # ifdef __i386__ -# define internal_function __attribute ((regparm (3), stdcall)) +# define internal_function __attribute__ ((regparm (3), stdcall)) # else # define internal_function # endif @@ -436,7 +436,7 @@ static void build_upper_buffer (re_string_t *pstr) internal_function; static void re_string_translate_buffer (re_string_t *pstr) internal_function; static unsigned int re_string_context_at (const re_string_t *input, int idx, int eflags) - internal_function __attribute ((pure)); + internal_function __attribute__ ((pure)); #endif #define re_string_peek_byte(pstr, offset) \ ((pstr)->mbs[(pstr)->cur_idx + offset]) @@ -726,7 +726,7 @@ typedef struct /* Inline functions for bitset operation. */ -static inline void +static void __attribute__ ((unused)) bitset_not (bitset_t set) { int bitset_i; @@ -734,7 +734,7 @@ bitset_not (bitset_t set) set[bitset_i] = ~set[bitset_i]; } -static inline void +static void __attribute__ ((unused)) bitset_merge (bitset_t dest, const bitset_t src) { int bitset_i; @@ -742,7 +742,7 @@ bitset_merge (bitset_t dest, const bitset_t src) dest[bitset_i] |= src[bitset_i]; } -static inline void +static void __attribute__ ((unused)) bitset_mask (bitset_t dest, const bitset_t src) { int bitset_i; @@ -752,8 +752,8 @@ bitset_mask (bitset_t dest, const bitset_t src) #ifdef RE_ENABLE_I18N /* Inline functions for re_string. */ -static inline int -internal_function __attribute ((pure)) +static int +internal_function __attribute__ ((pure, unused)) re_string_char_size_at (const re_string_t *pstr, int idx) { int byte_idx; @@ -765,8 +765,8 @@ re_string_char_size_at (const re_string_t *pstr, int idx) return byte_idx; } -static inline wint_t -internal_function __attribute ((pure)) +static wint_t +internal_function __attribute__ ((pure, unused)) re_string_wchar_at (const re_string_t *pstr, int idx) { if (pstr->mb_cur_max == 1) @@ -776,7 +776,7 @@ re_string_wchar_at (const re_string_t *pstr, int idx) # ifndef NOT_IN_libc static int -internal_function __attribute ((pure)) +internal_function __attribute__ ((pure, unused)) re_string_elem_size_at (const re_string_t *pstr, int idx) { # ifdef _LIBC -- cgit v1.2.3 From c0c2b9f5571b9c01e7fd3dd7553ecb9a3870756b Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Sat, 7 Dec 2013 19:05:03 +0200 Subject: Further compilation fixes, VMS and Z/OS. --- regex_internal.h | 1 + 1 file changed, 1 insertion(+) (limited to 'regex_internal.h') diff --git a/regex_internal.h b/regex_internal.h index 45a69655..448e32ea 100644 --- a/regex_internal.h +++ b/regex_internal.h @@ -155,6 +155,7 @@ is_blank (int c) # define __attribute(arg) __attribute__ (arg) #else # define __attribute(arg) +# define __attribute__(arg) /* GAWK: They left this out. Duh. */ #endif #ifdef GAWK -- cgit v1.2.3 From 5a41f696c4b8251583f5516084eaba3b752cb7f6 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Thu, 20 Feb 2014 19:41:21 +0200 Subject: Sync regex to GLIBC. --- regex_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'regex_internal.h') diff --git a/regex_internal.h b/regex_internal.h index 448e32ea..c8981a08 100644 --- a/regex_internal.h +++ b/regex_internal.h @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . -- cgit v1.2.3