summaryrefslogtreecommitdiff
path: root/libc/misc
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-07-23 11:19:00 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-07-23 11:19:00 +0000
commitf1775381f91f1250b20f1949dfd0364ddb0ee9fc (patch)
tree1326bd7f4dfd8c57f89c4d6b2f13d4f22f578abf /libc/misc
parentd35b0bc119816825a657f7c9c2a1f062e7048c39 (diff)
- fix inline keyword
Diffstat (limited to 'libc/misc')
-rw-r--r--libc/misc/ftw/ftw.c6
-rw-r--r--libc/misc/regex/regcomp.c10
-rw-r--r--libc/misc/regex/regex_internal.c2
-rw-r--r--libc/misc/regex/regex_internal.h10
-rw-r--r--libc/misc/regex/regexec.c2
-rw-r--r--libc/misc/sysvipc/msgq.c2
-rw-r--r--libc/misc/sysvipc/sem.c2
-rw-r--r--libc/misc/sysvipc/shm.c2
-rw-r--r--libc/misc/wordexp/wordexp.c6
9 files changed, 21 insertions, 21 deletions
diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c
index 81944ce98..c136f1e8d 100644
--- a/libc/misc/ftw/ftw.c
+++ b/libc/misc/ftw/ftw.c
@@ -279,7 +279,7 @@ object_compare (const void *p1, const void *p2)
}
-static inline int
+static __inline__ int
add_object (struct ftw_data *data, struct STAT *st)
{
struct known_object *newp = malloc (sizeof (struct known_object));
@@ -291,7 +291,7 @@ add_object (struct ftw_data *data, struct STAT *st)
}
-static inline int
+static __inline__ int
find_object (struct ftw_data *data, struct STAT *st)
{
struct known_object obj;
@@ -301,7 +301,7 @@ find_object (struct ftw_data *data, struct STAT *st)
}
-static inline int
+static __inline__ int
__attribute ((always_inline))
open_dir_stream (struct ftw_data *data, struct dir_data *dirp)
{
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)
diff --git a/libc/misc/sysvipc/msgq.c b/libc/misc/sysvipc/msgq.c
index c1ab27626..d83ed2208 100644
--- a/libc/misc/sysvipc/msgq.c
+++ b/libc/misc/sysvipc/msgq.c
@@ -7,7 +7,7 @@
#ifdef __NR_msgctl
#define __NR___libc_msgctl __NR_msgctl
-static inline _syscall3(int, __libc_msgctl, int, msqid, int, cmd, struct msqid_ds *, buf);
+static __inline__ _syscall3(int, __libc_msgctl, int, msqid, int, cmd, struct msqid_ds *, buf);
#endif
/* Message queue control operation. */
int msgctl(int msqid, int cmd, struct msqid_ds *buf)
diff --git a/libc/misc/sysvipc/sem.c b/libc/misc/sysvipc/sem.c
index 07705c9d9..1caec5a8c 100644
--- a/libc/misc/sysvipc/sem.c
+++ b/libc/misc/sysvipc/sem.c
@@ -40,7 +40,7 @@ union semun {
#ifdef __NR_semctl
#define __NR___semctl __NR_semctl
-static inline _syscall4(int, __semctl, int, semid, int, semnum, int, cmd, void *, arg);
+static __inline__ _syscall4(int, __semctl, int, semid, int, semnum, int, cmd, void *, arg);
#endif
int semctl(int semid, int semnum, int cmd, ...)
diff --git a/libc/misc/sysvipc/shm.c b/libc/misc/sysvipc/shm.c
index 9f76a12ed..b1af943b8 100644
--- a/libc/misc/sysvipc/shm.c
+++ b/libc/misc/sysvipc/shm.c
@@ -56,7 +56,7 @@ void * shmat (int shmid, const void *shmaddr, int shmflg)
/* Provide operations to control over shared memory segments. */
#ifdef __NR_shmctl
#define __NR___libc_shmctl __NR_shmctl
-static inline _syscall3(int, __libc_shmctl, int, shmid, int, cmd, struct shmid_ds *, buf);
+static __inline__ _syscall3(int, __libc_shmctl, int, shmid, int, cmd, struct shmid_ds *, buf);
#endif
int shmctl(int shmid, int cmd, struct shmid_ds *buf)
{
diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c
index 358586f75..34c86aec5 100644
--- a/libc/misc/wordexp/wordexp.c
+++ b/libc/misc/wordexp/wordexp.c
@@ -110,14 +110,14 @@ static int parse_dquote(char **word, size_t * word_length,
#define W_CHUNK (100)
/* Result of w_newword will be ignored if it's the last word. */
-static inline char *w_newword(size_t * actlen, size_t * maxlen)
+static __inline__ char *w_newword(size_t * actlen, size_t * maxlen)
{
*actlen = *maxlen = 0;
return NULL;
}
/* Add a character to the buffer, allocating room for it if needed. */
-static inline char *w_addchar(char *buffer, size_t * actlen,
+static __inline__ char *w_addchar(char *buffer, size_t * actlen,
size_t * maxlen, char ch)
/* (lengths exclude trailing zero) */
{
@@ -1897,7 +1897,7 @@ parse_param(char **word, size_t * word_length, size_t * max_length,
return error;
}
#else
-static inline int
+static __inline__ int
parse_backtick(char **word, size_t * word_length, size_t * max_length,
const char *words, size_t * offset, int flags,
wordexp_t * pwordexp, const char *ifs,