From f1d70dad5381352b3cad04b5ee0dd0efe2627683 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 7 Feb 2013 14:44:18 -0800 Subject: Remove lots of inline keywords. --- elf/dl-deps.c | 4 +--- elf/tlsdeschtab.h | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'elf') diff --git a/elf/dl-deps.c b/elf/dl-deps.c index fe90df61b1..cd1c236b2e 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -155,9 +155,7 @@ _dl_map_object_deps (struct link_map *map, const char *errstring; const char *objname; - auto inline void preload (struct link_map *map); - - inline void preload (struct link_map *map) + void preload (struct link_map *map) { known[nlist].done = 0; known[nlist].map = map; diff --git a/elf/tlsdeschtab.h b/elf/tlsdeschtab.h index 8de9861110..155f4fdd9b 100644 --- a/elf/tlsdeschtab.h +++ b/elf/tlsdeschtab.h @@ -129,7 +129,7 @@ _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset) or a futex wake to wake up any waiting threads, but let's try to avoid introducing such dependencies. */ -inline static int +static int _dl_tlsdesc_resolve_early_return_p (struct tlsdesc volatile *td, void *caller) { if (caller != td->entry) @@ -147,7 +147,7 @@ _dl_tlsdesc_resolve_early_return_p (struct tlsdesc volatile *td, void *caller) return 0; } -inline static void +static void _dl_tlsdesc_wake_up_held_fixups (void) { __rtld_lock_unlock_recursive (GL(dl_load_lock)); -- cgit 1.4.1