From f1775381f91f1250b20f1949dfd0364ddb0ee9fc Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Wed, 23 Jul 2008 11:19:00 +0000
Subject: - fix inline keyword

---
 libc/misc/regex/regcomp.c        | 10 +++++-----
 libc/misc/regex/regex_internal.c |  2 +-
 libc/misc/regex/regex_internal.h | 10 +++++-----
 libc/misc/regex/regexec.c        |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'libc/misc/regex')

diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c
index 471ea55f0..ab6bdd876 100644
--- a/libc/misc/regex/regcomp.c
+++ b/libc/misc/regex/regcomp.c
@@ -286,7 +286,7 @@ re_compile_fastmap (bufp)
 strong_alias(__re_compile_fastmap, re_compile_fastmap)
 #endif
 
-static inline void
+static __inline__ void
 __attribute ((always_inline))
 re_set_fastmap (char *fastmap, int icase, int ch)
 {
@@ -2721,7 +2721,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
      Seek the collating symbol entry correspondings to NAME.
      Return the index of the symbol in the SYMB_TABLE.  */
 
-  auto inline int32_t
+  auto __inline__ int32_t
   __attribute ((always_inline))
   seek_collating_symbol_entry (name, name_len)
 	 const unsigned char *name;
@@ -2759,7 +2759,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
      Look up the collation sequence value of BR_ELEM.
      Return the value if succeeded, UINT_MAX otherwise.  */
 
-  auto inline unsigned int
+  auto __inline__ unsigned int
   __attribute ((always_inline))
   lookup_collation_sequence_value (br_elem)
 	 bracket_elem_t *br_elem;
@@ -2827,7 +2827,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
      mbcset->range_ends, is a pointer argument sinse we may
      update it.  */
 
-  auto inline reg_errcode_t
+  auto __inline__ reg_errcode_t
   __attribute ((always_inline))
   build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem)
 	 re_charset_t *mbcset;
@@ -2910,7 +2910,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
      COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
      pointer argument sinse we may update it.  */
 
-  auto inline reg_errcode_t
+  auto __inline__ reg_errcode_t
   __attribute ((always_inline))
   build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name)
 	 re_charset_t *mbcset;
diff --git a/libc/misc/regex/regex_internal.c b/libc/misc/regex/regex_internal.c
index fa0b336e8..7bf59ef20 100644
--- a/libc/misc/regex/regex_internal.c
+++ b/libc/misc/regex/regex_internal.c
@@ -1366,7 +1366,7 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
   return dfa->nodes_len++;
 }
 
-static inline unsigned int
+static __inline__ unsigned int
 internal_function
 calc_state_hash (const re_node_set *nodes, unsigned int context)
 {
diff --git a/libc/misc/regex/regex_internal.h b/libc/misc/regex/regex_internal.h
index af38acc42..17fdb9b3c 100644
--- a/libc/misc/regex/regex_internal.h
+++ b/libc/misc/regex/regex_internal.h
@@ -682,7 +682,7 @@ typedef struct
 
 
 /* Inline functions for bitset operation.  */
-static inline void
+static __inline__ void
 bitset_not (bitset_t set)
 {
   int bitset_i;
@@ -690,7 +690,7 @@ bitset_not (bitset_t set)
     set[bitset_i] = ~set[bitset_i];
 }
 
-static inline void
+static __inline__ void
 bitset_merge (bitset_t dest, const bitset_t src)
 {
   int bitset_i;
@@ -698,7 +698,7 @@ bitset_merge (bitset_t dest, const bitset_t src)
     dest[bitset_i] |= src[bitset_i];
 }
 
-static inline void
+static __inline__ void
 bitset_mask (bitset_t dest, const bitset_t src)
 {
   int bitset_i;
@@ -708,7 +708,7 @@ bitset_mask (bitset_t dest, const bitset_t src)
 
 #ifdef RE_ENABLE_I18N
 /* Inline functions for re_string.  */
-static inline int
+static __inline__ int
 internal_function __attribute ((pure))
 re_string_char_size_at (const re_string_t *pstr, int idx)
 {
@@ -721,7 +721,7 @@ re_string_char_size_at (const re_string_t *pstr, int idx)
   return byte_idx;
 }
 
-static inline wint_t
+static __inline__ wint_t
 internal_function __attribute ((pure))
 re_string_wchar_at (const re_string_t *pstr, int idx)
 {
diff --git a/libc/misc/regex/regexec.c b/libc/misc/regex/regexec.c
index 2c8917e19..5ab7ab7cb 100644
--- a/libc/misc/regex/regexec.c
+++ b/libc/misc/regex/regexec.c
@@ -1027,7 +1027,7 @@ prune_impossible_nodes (mctx)
    We must select appropriate initial state depending on the context,
    since initial states may have constraints like "\<", "^", etc..  */
 
-static inline re_dfastate_t *
+static __inline__ re_dfastate_t *
 __attribute ((always_inline)) internal_function
 acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,
 			    int idx)
-- 
cgit v1.2.3