From f1775381f91f1250b20f1949dfd0364ddb0ee9fc Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 23 Jul 2008 11:19:00 +0000 Subject: - fix inline keyword --- extra/config/expr.h | 4 ++-- extra/config/lkc.h | 14 +++++++------- include/sys/mman.h | 10 +++++----- ldso/include/dl-elf.h | 4 ++-- ldso/include/dl-hash.h | 2 +- ldso/include/dl-syscall.h | 2 +- ldso/ldso/arm/dl-sysdep.h | 8 ++++---- ldso/ldso/bfin/dl-syscalls.h | 2 +- ldso/ldso/bfin/dl-sysdep.h | 2 +- ldso/ldso/cris/dl-sysdep.h | 6 +++--- ldso/ldso/dl-hash.c | 4 ++-- ldso/ldso/frv/dl-syscalls.h | 2 +- ldso/ldso/i386/dl-sysdep.h | 10 +++++----- ldso/ldso/m68k/dl-sysdep.h | 6 +++--- ldso/ldso/mips/dl-sysdep.h | 8 ++++---- ldso/ldso/powerpc/dl-sysdep.h | 8 ++++---- ldso/ldso/powerpc/elfinterp.c | 4 ++-- ldso/ldso/sh/dl-sysdep.h | 8 ++++---- ldso/ldso/sh64/dl-sysdep.h | 6 +++--- ldso/ldso/sparc/dl-sysdep.h | 8 ++++---- ldso/ldso/xtensa/dl-sysdep.h | 6 +++--- libc/misc/ftw/ftw.c | 6 +++--- 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 +- libc/misc/sysvipc/msgq.c | 2 +- libc/misc/sysvipc/sem.c | 2 +- libc/misc/sysvipc/shm.c | 2 +- libc/misc/wordexp/wordexp.c | 6 +++--- libc/signal/sigset-cvt-mask.h | 4 ++-- libc/stdlib/arc4random.c | 16 ++++++++-------- libc/stdlib/malloc/heap.h | 10 +++++----- libc/string/powerpc/memset.c | 2 +- libc/sysdeps/linux/alpha/sigprocmask.c | 2 +- libc/sysdeps/linux/arm/mmap.c | 6 +++--- libc/sysdeps/linux/common/__syscall_fcntl64.c | 2 +- libc/sysdeps/linux/common/_exit.c | 2 +- libc/sysdeps/linux/common/chdir.c | 2 +- libc/sysdeps/linux/common/chmod.c | 2 +- libc/sysdeps/linux/common/chown.c | 2 +- libc/sysdeps/linux/common/chroot.c | 2 +- libc/sysdeps/linux/common/create_module.c | 4 ++-- libc/sysdeps/linux/common/fchmod.c | 2 +- libc/sysdeps/linux/common/fchown.c | 2 +- libc/sysdeps/linux/common/flock.c | 2 +- libc/sysdeps/linux/common/fstat.c | 2 +- libc/sysdeps/linux/common/fstat64.c | 2 +- libc/sysdeps/linux/common/ftruncate64.c | 4 ++-- libc/sysdeps/linux/common/getdents.c | 2 +- libc/sysdeps/linux/common/getdents64.c | 2 +- libc/sysdeps/linux/common/getegid.c | 2 +- libc/sysdeps/linux/common/geteuid.c | 2 +- libc/sysdeps/linux/common/getgroups.c | 2 +- libc/sysdeps/linux/common/getpgid.c | 2 +- libc/sysdeps/linux/common/getpriority.c | 2 +- libc/sysdeps/linux/common/getresgid.c | 2 +- libc/sysdeps/linux/common/getresuid.c | 2 +- libc/sysdeps/linux/common/getsid.c | 2 +- libc/sysdeps/linux/common/kill.c | 2 +- libc/sysdeps/linux/common/klogctl.c | 2 +- libc/sysdeps/linux/common/lchown.c | 2 +- libc/sysdeps/linux/common/llseek.c | 2 +- libc/sysdeps/linux/common/lstat.c | 2 +- libc/sysdeps/linux/common/lstat64.c | 2 +- libc/sysdeps/linux/common/mkdir.c | 2 +- libc/sysdeps/linux/common/mknod.c | 2 +- libc/sysdeps/linux/common/mmap.c | 4 ++-- libc/sysdeps/linux/common/mmap64.c | 2 +- libc/sysdeps/linux/common/nice.c | 6 +++--- libc/sysdeps/linux/common/open.c | 2 +- libc/sysdeps/linux/common/posix_fadvise64.c | 2 +- libc/sysdeps/linux/common/pread_write.c | 4 ++-- libc/sysdeps/linux/common/ptrace.c | 2 +- libc/sysdeps/linux/common/readahead.c | 4 ++-- libc/sysdeps/linux/common/reboot.c | 2 +- libc/sysdeps/linux/common/rename.c | 2 +- libc/sysdeps/linux/common/sched_getaffinity.c | 2 +- libc/sysdeps/linux/common/sched_getparam.c | 2 +- libc/sysdeps/linux/common/sched_getscheduler.c | 2 +- libc/sysdeps/linux/common/sched_rr_get_interval.c | 2 +- libc/sysdeps/linux/common/sched_setaffinity.c | 2 +- libc/sysdeps/linux/common/sched_setparam.c | 2 +- libc/sysdeps/linux/common/sched_setscheduler.c | 2 +- libc/sysdeps/linux/common/setfsgid.c | 2 +- libc/sysdeps/linux/common/setfsuid.c | 2 +- libc/sysdeps/linux/common/setgid.c | 2 +- libc/sysdeps/linux/common/setgroups.c | 2 +- libc/sysdeps/linux/common/setpgid.c | 2 +- libc/sysdeps/linux/common/setregid.c | 2 +- libc/sysdeps/linux/common/setresgid.c | 2 +- libc/sysdeps/linux/common/setresuid.c | 2 +- libc/sysdeps/linux/common/setreuid.c | 2 +- libc/sysdeps/linux/common/setuid.c | 2 +- libc/sysdeps/linux/common/sigpending.c | 2 +- libc/sysdeps/linux/common/sigqueue.c | 2 +- libc/sysdeps/linux/common/sigsuspend.c | 4 ++-- libc/sysdeps/linux/common/stat.c | 2 +- libc/sysdeps/linux/common/stat64.c | 2 +- libc/sysdeps/linux/common/sync.c | 2 +- libc/sysdeps/linux/common/truncate64.c | 4 ++-- libc/sysdeps/linux/common/umask.c | 2 +- libc/sysdeps/linux/common/umount.c | 2 +- libc/sysdeps/linux/common/ustat.c | 2 +- libc/sysdeps/linux/common/wait4.c | 2 +- libc/sysdeps/linux/e1/bits/fenvinline.h | 8 ++++---- libc/sysdeps/linux/e1/longjmp.c | 2 +- libc/sysdeps/linux/frv/mmap.c | 2 +- libc/sysdeps/linux/mips/pread_write.c | 4 ++-- libc/sysdeps/linux/powerpc/pread_write.c | 8 ++++---- libc/sysdeps/linux/sh/pread_write.c | 4 ++-- libc/sysdeps/linux/xtensa/pread_write.c | 4 ++-- libpthread/linuxthreads.old/internals.h | 8 ++++---- libpthread/linuxthreads.old/manager.c | 2 +- libpthread/linuxthreads.old/oldsemaphore.c | 2 +- libpthread/linuxthreads.old/ptfork.c | 2 +- libpthread/linuxthreads.old/queue.h | 8 ++++---- libpthread/linuxthreads.old/restart.h | 6 +++--- libpthread/linuxthreads.old/spinlock.c | 2 +- libpthread/linuxthreads.old/spinlock.h | 22 +++++++++++----------- .../linuxthreads.old/sysdeps/mips/pt-machine.h | 2 +- libpthread/linuxthreads.old_db/thread_dbP.h | 2 +- libpthread/linuxthreads/descr.h | 4 ++-- libpthread/linuxthreads/internals.h | 6 +++--- libpthread/linuxthreads/manager.c | 2 +- libpthread/linuxthreads/ptcleanup.c | 2 +- libpthread/linuxthreads/pthread.c | 2 +- libpthread/linuxthreads/queue.h | 8 ++++---- libpthread/linuxthreads/restart.h | 6 +++--- libpthread/linuxthreads/spinlock.c | 2 +- libpthread/linuxthreads/spinlock.h | 22 +++++++++++----------- libpthread/linuxthreads/sysdeps/pthread/list.h | 8 ++++---- .../linuxthreads/sysdeps/pthread/posix-timer.h | 18 +++++++++--------- .../linuxthreads/sysdeps/pthread/timer_routines.c | 20 ++++++++++---------- .../linuxthreads/sysdeps/unix/sysv/linux/sh/smp.h | 2 +- .../linuxthreads/sysdeps/unix/sysv/linux/sigwait.c | 2 +- .../linuxthreads/sysdeps/unix/sysv/linux/smp.h | 2 +- libpthread/linuxthreads_db/thread_dbP.h | 2 +- librt/mq_getsetattr.c | 2 +- librt/mq_notify.c | 2 +- librt/mq_open.c | 2 +- librt/mq_receive.c | 2 +- librt/mq_send.c | 2 +- librt/mq_unlink.c | 2 +- librt/timer_create.c | 2 +- librt/timer_delete.c | 2 +- librt/timer_getoverr.c | 2 +- librt/timer_gettime.c | 2 +- librt/timer_settime.c | 2 +- utils/bswap.h | 4 ++-- utils/ldd.c | 8 ++++---- utils/readelf.c | 4 ++-- 152 files changed, 298 insertions(+), 298 deletions(-) diff --git a/extra/config/expr.h b/extra/config/expr.h index 9d4cba1c0..9d60dd330 100644 --- a/extra/config/expr.h +++ b/extra/config/expr.h @@ -184,12 +184,12 @@ void expr_fprint(struct expr *e, FILE *out); struct gstr; /* forward */ void expr_gstr_print(struct expr *e, struct gstr *gs); -static inline int expr_is_yes(struct expr *e) +static __inline__ int expr_is_yes(struct expr *e) { return !e || (e->type == E_SYMBOL && e->left.sym == &symbol_yes); } -static inline int expr_is_no(struct expr *e) +static __inline__ int expr_is_no(struct expr *e) { return e && (e->type == E_SYMBOL && e->left.sym == &symbol_no); } diff --git a/extra/config/lkc.h b/extra/config/lkc.h index 4bc68f20a..c55c2fbd7 100644 --- a/extra/config/lkc.h +++ b/extra/config/lkc.h @@ -116,38 +116,38 @@ struct property *prop_alloc(enum prop_type type, struct symbol *sym); struct symbol *prop_get_symbol(struct property *prop); struct property *sym_get_env_prop(struct symbol *sym); -static inline tristate sym_get_tristate_value(struct symbol *sym) +static __inline__ tristate sym_get_tristate_value(struct symbol *sym) { return sym->curr.tri; } -static inline struct symbol *sym_get_choice_value(struct symbol *sym) +static __inline__ struct symbol *sym_get_choice_value(struct symbol *sym) { return (struct symbol *)sym->curr.val; } -static inline bool sym_set_choice_value(struct symbol *ch, struct symbol *chval) +static __inline__ bool sym_set_choice_value(struct symbol *ch, struct symbol *chval) { return sym_set_tristate_value(chval, yes); } -static inline bool sym_is_choice(struct symbol *sym) +static __inline__ bool sym_is_choice(struct symbol *sym) { return sym->flags & SYMBOL_CHOICE ? true : false; } -static inline bool sym_is_choice_value(struct symbol *sym) +static __inline__ bool sym_is_choice_value(struct symbol *sym) { return sym->flags & SYMBOL_CHOICEVAL ? true : false; } -static inline bool sym_is_optional(struct symbol *sym) +static __inline__ bool sym_is_optional(struct symbol *sym) { return sym->flags & SYMBOL_OPTIONAL ? true : false; } -static inline bool sym_has_value(struct symbol *sym) +static __inline__ bool sym_has_value(struct symbol *sym) { return sym->flags & SYMBOL_DEF_USER ? true : false; } diff --git a/include/sys/mman.h b/include/sys/mman.h index 326685f61..10471e683 100644 --- a/include/sys/mman.h +++ b/include/sys/mman.h @@ -94,7 +94,7 @@ extern int msync (void *__addr, size_t __len, int __flags); #else /* On no-mmu systems you can't have real private mappings. */ -static inline int msync (void *__addr, size_t __len, int __flags) { return 0; } +static __inline__ int msync (void *__addr, size_t __len, int __flags) { return 0; } #endif @@ -131,10 +131,10 @@ extern int munlockall (void) __THROW; /* On no-mmu systems, memory cannot be swapped out, so * these functions will always succeed. */ -static inline int mlock (__const void *__addr, size_t __len) { return 0; } -static inline int munlock (__const void *__addr, size_t __len) { return 0; } -static inline int mlockall (int __flags) { return 0; } -static inline int munlockall (void) { return 0; } +static __inline__ int mlock (__const void *__addr, size_t __len) { return 0; } +static __inline__ int munlock (__const void *__addr, size_t __len) { return 0; } +static __inline__ int mlockall (int __flags) { return 0; } +static __inline__ int munlockall (void) { return 0; } #endif #endif /* __UCLIBC_HAS_REALTIME__ */ diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h index 08b1c8b50..076678cfc 100644 --- a/ldso/include/dl-elf.h +++ b/ldso/include/dl-elf.h @@ -21,8 +21,8 @@ struct elf_resolve; extern int _dl_map_cache(void); extern int _dl_unmap_cache(void); #else -static inline void _dl_map_cache(void) { } -static inline void _dl_unmap_cache(void) { } +static __inline__ void _dl_map_cache(void) { } +static __inline__ void _dl_unmap_cache(void) { } #endif diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h index 2c0f306b6..9b87783fa 100644 --- a/ldso/include/dl-hash.h +++ b/ldso/include/dl-hash.h @@ -134,7 +134,7 @@ extern int _dl_linux_dynamic_link(void); extern char * _dl_library_path; extern char * _dl_not_lazy; -static inline int _dl_symbol(char * name) +static __inline__ int _dl_symbol(char * name) { if (name[0] != '_' || name[1] != 'd' || name[2] != 'l' || name[3] != '_') return 0; diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index d017866eb..fcc5c24ec 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -127,7 +127,7 @@ static __always_inline _syscall3(int, _dl_readlink, const char *, path, char *, #ifdef __UCLIBC_HAS_SSP__ # include # define __NR__dl_gettimeofday __NR_gettimeofday -static inline _syscall2(int, _dl_gettimeofday, struct timeval *, tv, +static __inline__ _syscall2(int, _dl_gettimeofday, struct timeval *, tv, # ifdef __USE_BSD struct timezone *, tz); # else diff --git a/ldso/ldso/arm/dl-sysdep.h b/ldso/ldso/arm/dl-sysdep.h index 65368d296..2a83f86fb 100644 --- a/ldso/ldso/arm/dl-sysdep.h +++ b/ldso/ldso/arm/dl-sysdep.h @@ -15,7 +15,7 @@ GOT_BASE[1] = (unsigned long) MODULE; \ } -static inline unsigned long arm_modulus(unsigned long m, unsigned long p) +static __inline__ unsigned long arm_modulus(unsigned long m, unsigned long p) { unsigned long i,t,inc; i=p; t=0; @@ -72,7 +72,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry); first element of the GOT. We used to use the PIC register to do this without a constant pool reference, but GCC 4.2 will use a pseudo-register for the PIC base, so it may not be in r10. */ -static inline Elf32_Addr __attribute__ ((unused)) +static __inline__ Elf32_Addr __attribute__ ((unused)) elf_machine_dynamic (void) { Elf32_Addr dynamic; @@ -104,7 +104,7 @@ elf_machine_dynamic (void) } /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr __attribute__ ((unused)) +static __inline__ Elf32_Addr __attribute__ ((unused)) elf_machine_load_address (void) { extern void __dl_start __asm__ ("_dl_start"); @@ -128,7 +128,7 @@ elf_machine_load_address (void) return pcrel_addr - got_addr; } -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/bfin/dl-syscalls.h b/ldso/ldso/bfin/dl-syscalls.h index f9ba79b7c..21e4cdd2c 100644 --- a/ldso/ldso/bfin/dl-syscalls.h +++ b/ldso/ldso/bfin/dl-syscalls.h @@ -30,7 +30,7 @@ extern int _dl_errno; #if DYNAMIC_LOADER_IN_SIMULATOR #define __NR___syscall_mmap2 __NR_mmap2 -static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, +static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, off_t, offset); /* Make sure we don't get another definition of _dl_mmap from the diff --git a/ldso/ldso/bfin/dl-sysdep.h b/ldso/ldso/bfin/dl-sysdep.h index 8c3a16663..735183585 100644 --- a/ldso/ldso/bfin/dl-sysdep.h +++ b/ldso/ldso/bfin/dl-sysdep.h @@ -213,7 +213,7 @@ while (0) #endif #include -static inline void +static __inline__ void elf_machine_relative (DL_LOADADDR_TYPE load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/cris/dl-sysdep.h b/ldso/ldso/cris/dl-sysdep.h index b84dcad70..c68541d1b 100644 --- a/ldso/ldso/cris/dl-sysdep.h +++ b/ldso/ldso/cris/dl-sysdep.h @@ -39,7 +39,7 @@ extern unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entr || ((type) == R_CRIS_GLOB_DAT)) * ELF_RTYPE_CLASS_PLT) \ | (((type) == R_CRIS_COPY) * ELF_RTYPE_CLASS_COPY)) -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_dynamic(void) { /* Don't just set this to an asm variable "r0" since that's not logical @@ -61,7 +61,7 @@ elf_machine_dynamic(void) there's some other symbol we could use, that we don't *have* to force a GOT entry for. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_load_address(void) { Elf32_Addr gotaddr_diff; @@ -95,7 +95,7 @@ elf_machine_load_address(void) return gotaddr_diff; } -static inline void +static __inline__ void elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/dl-hash.c b/ldso/ldso/dl-hash.c index 6eef1c742..2a393353b 100644 --- a/ldso/ldso/dl-hash.c +++ b/ldso/ldso/dl-hash.c @@ -57,7 +57,7 @@ struct dyn_elf *_dl_handles = NULL; /* This is the new hash function that is used by the ELF linker to generate the * GNU hash table that each executable and library will have if --hash-style=[gnu,both] * is passed to the linker. We need it to decode the GNU hash table. */ -static inline Elf_Symndx _dl_gnu_hash (const unsigned char *name) +static __inline__ Elf_Symndx _dl_gnu_hash (const unsigned char *name) { unsigned long h = 5381; unsigned char c; @@ -70,7 +70,7 @@ static inline Elf_Symndx _dl_gnu_hash (const unsigned char *name) /* This is the hash function that is used by the ELF linker to generate the * hash table that each executable and library is required to have. We need * it to decode the hash table. */ -static inline Elf_Symndx _dl_elf_hash(const unsigned char *name) +static __inline__ Elf_Symndx _dl_elf_hash(const unsigned char *name) { unsigned long hash=0; unsigned long tmp; diff --git a/ldso/ldso/frv/dl-syscalls.h b/ldso/ldso/frv/dl-syscalls.h index ffd59b82d..093d0dca8 100644 --- a/ldso/ldso/frv/dl-syscalls.h +++ b/ldso/ldso/frv/dl-syscalls.h @@ -16,7 +16,7 @@ extern int _dl_errno; #if DYNAMIC_LOADER_IN_SIMULATOR #define __NR___syscall_mmap2 __NR_mmap2 -static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, +static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, off_t, offset); /* Make sure we don't get another definition of _dl_mmap from the diff --git a/ldso/ldso/i386/dl-sysdep.h b/ldso/ldso/i386/dl-sysdep.h index 931abe305..19128df7b 100644 --- a/ldso/ldso/i386/dl-sysdep.h +++ b/ldso/ldso/i386/dl-sysdep.h @@ -42,8 +42,8 @@ extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_ent /* Return the link-time address of _DYNAMIC. Conveniently, this is the first element of the GOT. This must be inlined in a function which uses global data. */ -static inline Elf32_Addr elf_machine_dynamic (void) attribute_unused; -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_dynamic (void) attribute_unused; +static __inline__ Elf32_Addr elf_machine_dynamic (void) { register Elf32_Addr *got __asm__ ("%ebx"); @@ -52,8 +52,8 @@ elf_machine_dynamic (void) /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr elf_machine_load_address (void) attribute_unused; -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_load_address (void) attribute_unused; +static __inline__ Elf32_Addr elf_machine_load_address (void) { /* It doesn't matter what variable this is, the reference never makes @@ -66,7 +66,7 @@ elf_machine_load_address (void) return addr; } -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/m68k/dl-sysdep.h b/ldso/ldso/m68k/dl-sysdep.h index 138cabd41..bb36dcc28 100644 --- a/ldso/ldso/m68k/dl-sysdep.h +++ b/ldso/ldso/m68k/dl-sysdep.h @@ -41,7 +41,7 @@ extern unsigned long _dl_linux_resolver (struct elf_resolve *, int); /* Return the link-time address of _DYNAMIC. Conveniently, this is the first element of the GOT. This must be inlined in a function which uses global data. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_dynamic (void) { register Elf32_Addr *got __asm__ ("%a5"); @@ -50,7 +50,7 @@ elf_machine_dynamic (void) /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_load_address (void) { Elf32_Addr addr; @@ -60,7 +60,7 @@ elf_machine_load_address (void) return addr; } -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/mips/dl-sysdep.h b/ldso/ldso/mips/dl-sysdep.h index 1e69653b7..1b5a6e07a 100644 --- a/ldso/ldso/mips/dl-sysdep.h +++ b/ldso/ldso/mips/dl-sysdep.h @@ -163,7 +163,7 @@ void _dl_perform_mips_global_got_relocations(struct elf_resolve *tpnt, int lazy) #define OFFSET_GP_GOT 0x7ff0 -static inline ElfW(Addr) * +static __inline__ ElfW(Addr) * elf_mips_got_from_gpreg (ElfW(Addr) gpreg) { /* FIXME: the offset of gp from GOT may be system-dependent. */ @@ -173,7 +173,7 @@ elf_mips_got_from_gpreg (ElfW(Addr) gpreg) /* Return the link-time address of _DYNAMIC. Conveniently, this is the first element of the GOT. This must be inlined in a function which uses global data. We assume its $gp points to the primary GOT. */ -static inline ElfW(Addr) +static __inline__ ElfW(Addr) elf_machine_dynamic (void) { register ElfW(Addr) gp __asm__ ("$28"); @@ -192,7 +192,7 @@ elf_machine_dynamic (void) #endif /* Return the run-time load address of the shared object. */ -static inline ElfW(Addr) +static __inline__ ElfW(Addr) elf_machine_load_address (void) { ElfW(Addr) addr; @@ -208,7 +208,7 @@ elf_machine_load_address (void) return addr; } -static inline void +static __inline__ void elf_machine_relative (ElfW(Addr) load_off, const ElfW(Addr) rel_addr, ElfW(Word) relative_count) { diff --git a/ldso/ldso/powerpc/dl-sysdep.h b/ldso/ldso/powerpc/dl-sysdep.h index a4a2dd144..48a8bfb69 100644 --- a/ldso/ldso/powerpc/dl-sysdep.h +++ b/ldso/ldso/powerpc/dl-sysdep.h @@ -90,7 +90,7 @@ void _dl_init_got(unsigned long *lpnt,struct elf_resolve *tpnt); #define ELF_MACHINE_PLTREL_OVERLAP 1 /* Return the value of the GOT pointer. */ -static inline Elf32_Addr * __attribute__ ((const)) +static __inline__ Elf32_Addr * __attribute__ ((const)) ppc_got (void) { Elf32_Addr *got; @@ -109,14 +109,14 @@ ppc_got (void) /* Return the link-time address of _DYNAMIC, stored as the first value in the GOT. */ -static inline Elf32_Addr __attribute__ ((const)) +static __inline__ Elf32_Addr __attribute__ ((const)) elf_machine_dynamic (void) { return *ppc_got(); } /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr __attribute__ ((const)) +static __inline__ Elf32_Addr __attribute__ ((const)) elf_machine_load_address (void) { Elf32_Addr *branchaddr; @@ -164,7 +164,7 @@ elf_machine_load_address (void) return runtime_dynamic - elf_machine_dynamic (); } -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/powerpc/elfinterp.c b/ldso/ldso/powerpc/elfinterp.c index 8953e7059..7fa626fb4 100644 --- a/ldso/ldso/powerpc/elfinterp.c +++ b/ldso/ldso/powerpc/elfinterp.c @@ -186,7 +186,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry) return finaladdr; } -static inline int +static __inline__ int _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope, ELF_RELOC *rpnt, Elf32_Sym *symtab, char *strtab) { @@ -368,7 +368,7 @@ void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt, PPC_ISYNC; } -static inline int +static __inline__ int _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope, unsigned long rel_addr, unsigned long rel_size, int (*reloc_fnc) (struct elf_resolve *tpnt, struct dyn_elf *scope, diff --git a/ldso/ldso/sh/dl-sysdep.h b/ldso/ldso/sh/dl-sysdep.h index da109782e..35a66fb54 100644 --- a/ldso/ldso/sh/dl-sysdep.h +++ b/ldso/ldso/sh/dl-sysdep.h @@ -25,7 +25,7 @@ struct elf_resolve; extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry); -static inline unsigned int +static __inline__ unsigned int _dl_urem(unsigned int n, unsigned int base) { int res; @@ -100,7 +100,7 @@ _dl_urem(unsigned int n, unsigned int base) /* Return the link-time address of _DYNAMIC. Conveniently, this is the first element of the GOT. This must be inlined in a function which uses global data. */ -static inline Elf32_Addr __attribute__ ((unused)) +static __inline__ Elf32_Addr __attribute__ ((unused)) elf_machine_dynamic (void) { register Elf32_Addr *got; @@ -109,7 +109,7 @@ elf_machine_dynamic (void) } /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr __attribute__ ((unused)) +static __inline__ Elf32_Addr __attribute__ ((unused)) elf_machine_load_address (void) { Elf32_Addr addr; @@ -151,7 +151,7 @@ elf_machine_load_address (void) } \ } -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/sh64/dl-sysdep.h b/ldso/ldso/sh64/dl-sysdep.h index f16885b23..dadde6103 100644 --- a/ldso/ldso/sh64/dl-sysdep.h +++ b/ldso/ldso/sh64/dl-sysdep.h @@ -42,7 +42,7 @@ extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_ent /* Return the link-time address of _DYNAMIC. Conveniently, this is the first element of the GOT. This must be inlined in a function which uses global data. */ -static inline Elf32_Addr elf_machine_dynamic(void) +static __inline__ Elf32_Addr elf_machine_dynamic(void) { register Elf32_Addr *got; @@ -70,7 +70,7 @@ static inline Elf32_Addr elf_machine_dynamic(void) } /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr elf_machine_load_address(void) +static __inline__ Elf32_Addr elf_machine_load_address(void) { Elf32_Addr addr; @@ -123,7 +123,7 @@ static inline Elf32_Addr elf_machine_load_address(void) } \ } -static inline void +static __inline__ void elf_machine_relative(Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/sparc/dl-sysdep.h b/ldso/ldso/sparc/dl-sysdep.h index 82665083c..7707cfcb9 100644 --- a/ldso/ldso/sparc/dl-sysdep.h +++ b/ldso/ldso/sparc/dl-sysdep.h @@ -49,7 +49,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry); #ifndef COMPILE_ASM /* Cheap modulo implementation, taken from arm/ld_sysdep.h. */ -static inline unsigned long +static __inline__ unsigned long sparc_mod(unsigned long m, unsigned long p) { unsigned long i, t, inc; @@ -127,7 +127,7 @@ do { register Elf32_Addr pc __asm__("o7"); \ /* Return the link-time address of _DYNAMIC. Conveniently, this is the first element of the GOT. This must be inlined in a function which uses global data. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_dynamic (void) { register Elf32_Addr *got __asm__ ("%l7"); @@ -138,7 +138,7 @@ elf_machine_dynamic (void) } /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_load_address (void) { register Elf32_Addr *pc __asm__ ("%o7"), *got __asm ("%l7"); @@ -157,7 +157,7 @@ elf_machine_load_address (void) return (Elf32_Addr) got - *got + (pc[2] - pc[3]) * 4 - 4; } -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { diff --git a/ldso/ldso/xtensa/dl-sysdep.h b/ldso/ldso/xtensa/dl-sysdep.h index afbbf3bfe..b58feff54 100644 --- a/ldso/ldso/xtensa/dl-sysdep.h +++ b/ldso/ldso/xtensa/dl-sysdep.h @@ -87,7 +87,7 @@ extern unsigned long _dl_linux_resolver (struct elf_resolve *, int); (((type) == R_XTENSA_JMP_SLOT) * ELF_RTYPE_CLASS_PLT) /* Return the link-time address of _DYNAMIC. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_dynamic (void) { /* This function is only used while bootstrapping the runtime linker. @@ -97,7 +97,7 @@ elf_machine_dynamic (void) } /* Return the run-time load address of the shared object. */ -static inline Elf32_Addr +static __inline__ Elf32_Addr elf_machine_load_address (void) { Elf32_Addr addr, tmp; @@ -118,7 +118,7 @@ elf_machine_load_address (void) return addr - 3; } -static inline void +static __inline__ void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { 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, diff --git a/libc/signal/sigset-cvt-mask.h b/libc/signal/sigset-cvt-mask.h index ca4774dbd..7b2f4cdce 100644 --- a/libc/signal/sigset-cvt-mask.h +++ b/libc/signal/sigset-cvt-mask.h @@ -19,7 +19,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -static inline int __attribute__ ((unused)) +static __inline__ int __attribute__ ((unused)) sigset_set_old_mask (sigset_t *set, int mask) { unsigned long int *ptr; @@ -37,7 +37,7 @@ sigset_set_old_mask (sigset_t *set, int mask) return 0; } -static inline int __attribute__ ((unused)) +static __inline__ int __attribute__ ((unused)) sigset_get_old_mask (const sigset_t *set) { return (unsigned int) set->__val[0]; diff --git a/libc/stdlib/arc4random.c b/libc/stdlib/arc4random.c index 836b79f6c..bf6a4cd30 100644 --- a/libc/stdlib/arc4random.c +++ b/libc/stdlib/arc4random.c @@ -52,13 +52,13 @@ struct arc4_stream { static int rs_initialized; static struct arc4_stream rs; -static inline void arc4_init(struct arc4_stream *); -static inline void arc4_addrandom(struct arc4_stream *, u_char *, int); +static __inline__ void arc4_init(struct arc4_stream *); +static __inline__ void arc4_addrandom(struct arc4_stream *, u_char *, int); static void arc4_stir(struct arc4_stream *); -static inline uint8_t arc4_getbyte(struct arc4_stream *); -static inline uint32_t arc4_getword(struct arc4_stream *); +static __inline__ uint8_t arc4_getbyte(struct arc4_stream *); +static __inline__ uint32_t arc4_getword(struct arc4_stream *); -static inline void +static __inline__ void arc4_init(as) struct arc4_stream *as; { @@ -70,7 +70,7 @@ arc4_init(as) as->j = 0; } -static inline void +static __inline__ void arc4_addrandom(as, dat, datlen) struct arc4_stream *as; u_char *dat; @@ -141,7 +141,7 @@ arc4_stir(as) arc4_getbyte(as); } -static inline uint8_t +static __inline__ uint8_t arc4_getbyte(as) struct arc4_stream *as; { @@ -156,7 +156,7 @@ arc4_getbyte(as) return (as->s[(si + sj) & 0xff]); } -static inline uint32_t +static __inline__ uint32_t arc4_getword(as) struct arc4_stream *as; { diff --git a/libc/stdlib/malloc/heap.h b/libc/stdlib/malloc/heap.h index 38ec41cbf..6505cd223 100644 --- a/libc/stdlib/malloc/heap.h +++ b/libc/stdlib/malloc/heap.h @@ -141,7 +141,7 @@ extern void __heap_check (struct heap *heap, const char *str); /* Delete the free-area FA from HEAP. */ -static inline void +static __inline__ void __heap_delete (struct heap *heap, struct heap_free_area *fa) { if (fa->next) @@ -156,7 +156,7 @@ __heap_delete (struct heap *heap, struct heap_free_area *fa) /* Link the free-area FA between the existing free-area's PREV and NEXT in HEAP. PREV and NEXT may be 0; if PREV is 0, FA is installed as the first free-area. */ -static inline void +static __inline__ void __heap_link_free_area (struct heap *heap, struct heap_free_area *fa, struct heap_free_area *prev, struct heap_free_area *next) @@ -175,7 +175,7 @@ __heap_link_free_area (struct heap *heap, struct heap_free_area *fa, /* Update the mutual links between the free-areas PREV and FA in HEAP. PREV may be 0, in which case FA is installed as the first free-area (but FA may not be 0). */ -static inline void +static __inline__ void __heap_link_free_area_after (struct heap *heap, struct heap_free_area *fa, struct heap_free_area *prev) @@ -191,7 +191,7 @@ __heap_link_free_area_after (struct heap *heap, free-area's PREV and NEXT in HEAP, and return a pointer to its header. PREV and NEXT may be 0; if PREV is 0, MEM is installed as the first free-area. */ -static inline struct heap_free_area * +static __inline__ struct heap_free_area * __heap_add_free_area (struct heap *heap, void *mem, size_t size, struct heap_free_area *prev, struct heap_free_area *next) @@ -209,7 +209,7 @@ __heap_add_free_area (struct heap *heap, void *mem, size_t size, /* Allocate SIZE bytes from the front of the free-area FA in HEAP, and return the amount actually allocated (which may be more than SIZE). */ -static inline size_t +static __inline__ size_t __heap_free_area_alloc (struct heap *heap, struct heap_free_area *fa, size_t size) { diff --git a/libc/string/powerpc/memset.c b/libc/string/powerpc/memset.c index d62ec0ee0..93e025f00 100644 --- a/libc/string/powerpc/memset.c +++ b/libc/string/powerpc/memset.c @@ -23,7 +23,7 @@ /* Experimentally off - libc_hidden_proto(memset) */ -static inline int expand_byte_word(int c){ +static __inline__ int expand_byte_word(int c){ /* this does: c = c << 8 | c; c = c << 16 | c ; diff --git a/libc/sysdeps/linux/alpha/sigprocmask.c b/libc/sysdeps/linux/alpha/sigprocmask.c index 1da6f7baf..e9ebe091f 100644 --- a/libc/sysdeps/linux/alpha/sigprocmask.c +++ b/libc/sysdeps/linux/alpha/sigprocmask.c @@ -25,7 +25,7 @@ /* When there is kernel support for more than 64 signals, we'll have to switch to a new system call convention here. */ -static inline _syscall2(int, osf_sigprocmask, int, how, unsigned long int, setval); +static __inline__ _syscall2(int, osf_sigprocmask, int, how, unsigned long int, setval); libc_hidden_proto(sigprocmask) int diff --git a/libc/sysdeps/linux/arm/mmap.c b/libc/sysdeps/linux/arm/mmap.c index 440cb17b1..47a29f4ae 100644 --- a/libc/sysdeps/linux/arm/mmap.c +++ b/libc/sysdeps/linux/arm/mmap.c @@ -16,7 +16,7 @@ libc_hidden_proto (mmap) #if defined (__UCLIBC_MMAP_HAS_6_ARGS__) && defined (__NR_mmap) #define __NR__mmap __NR_mmap -static inline _syscall6 (__ptr_t, _mmap, __ptr_t, addr, size_t, len, +static __inline__ _syscall6 (__ptr_t, _mmap, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, __off_t, offset); __ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset) @@ -32,7 +32,7 @@ __ptr_t mmap(__ptr_t addr, size_t len, int prot, # define MMAP2_PAGE_SHIFT 12 #endif -static inline _syscall6 (__ptr_t, _mmap, __ptr_t, addr, size_t, len, +static __inline__ _syscall6 (__ptr_t, _mmap, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, __off_t, offset); __ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset) @@ -53,7 +53,7 @@ __ptr_t mmap(__ptr_t addr, size_t len, int prot, } #elif defined (__NR_mmap) # define __NR__mmap __NR_mmap -static inline _syscall1(__ptr_t, _mmap, unsigned long *, buffer); +static __inline__ _syscall1(__ptr_t, _mmap, unsigned long *, buffer); __ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset) { diff --git a/libc/sysdeps/linux/common/__syscall_fcntl64.c b/libc/sysdeps/linux/common/__syscall_fcntl64.c index 4c5495c24..84c2ea2bf 100644 --- a/libc/sysdeps/linux/common/__syscall_fcntl64.c +++ b/libc/sysdeps/linux/common/__syscall_fcntl64.c @@ -16,7 +16,7 @@ extern __typeof(fcntl64) __libc_fcntl64; libc_hidden_proto(__libc_fcntl64) #define __NR___syscall_fcntl64 __NR_fcntl64 -static inline _syscall3(int, __syscall_fcntl64, int, fd, int, cmd, long, arg); +static __inline__ _syscall3(int, __syscall_fcntl64, int, fd, int, cmd, long, arg); int __libc_fcntl64(int fd, int cmd, ...) { long arg; diff --git a/libc/sysdeps/linux/common/_exit.c b/libc/sysdeps/linux/common/_exit.c index 02c951152..945a254b5 100644 --- a/libc/sysdeps/linux/common/_exit.c +++ b/libc/sysdeps/linux/common/_exit.c @@ -18,7 +18,7 @@ libc_hidden_proto(_exit) #ifndef INLINE_SYSCALL #define INLINE_SYSCALL(name, nr, args...) __syscall_exit (args) #define __NR___syscall_exit __NR_exit -static inline _syscall1(void, __syscall_exit, int, status); +static __inline__ _syscall1(void, __syscall_exit, int, status); #endif void attribute_noreturn _exit(int status) diff --git a/libc/sysdeps/linux/common/chdir.c b/libc/sysdeps/linux/common/chdir.c index d67fa0c9c..95a825eb7 100644 --- a/libc/sysdeps/linux/common/chdir.c +++ b/libc/sysdeps/linux/common/chdir.c @@ -15,7 +15,7 @@ libc_hidden_proto(chdir) #define __NR___syscall_chdir __NR_chdir -static inline _syscall1(int, __syscall_chdir, const char *, path); +static __inline__ _syscall1(int, __syscall_chdir, const char *, path); int chdir(const char *path) { return __syscall_chdir(path); diff --git a/libc/sysdeps/linux/common/chmod.c b/libc/sysdeps/linux/common/chmod.c index 0b9e89426..34a30a4b0 100644 --- a/libc/sysdeps/linux/common/chmod.c +++ b/libc/sysdeps/linux/common/chmod.c @@ -13,7 +13,7 @@ libc_hidden_proto(chmod) #define __NR___syscall_chmod __NR_chmod -static inline _syscall2(int, __syscall_chmod, const char *, path, __kernel_mode_t, mode); +static __inline__ _syscall2(int, __syscall_chmod, const char *, path, __kernel_mode_t, mode); int chmod(const char *path, mode_t mode) { diff --git a/libc/sysdeps/linux/common/chown.c b/libc/sysdeps/linux/common/chown.c index 169ea3aea..27b89a3f4 100644 --- a/libc/sysdeps/linux/common/chown.c +++ b/libc/sysdeps/linux/common/chown.c @@ -24,7 +24,7 @@ _syscall3(int, chown, const char *, path, uid_t, owner, gid_t, group); #else # define __NR___syscall_chown __NR_chown -static inline _syscall3(int, __syscall_chown, const char *, path, +static __inline__ _syscall3(int, __syscall_chown, const char *, path, __kernel_uid_t, owner, __kernel_gid_t, group); int chown(const char *path, uid_t owner, gid_t group) diff --git a/libc/sysdeps/linux/common/chroot.c b/libc/sysdeps/linux/common/chroot.c index 5ea76ab0d..12d09bbbe 100644 --- a/libc/sysdeps/linux/common/chroot.c +++ b/libc/sysdeps/linux/common/chroot.c @@ -14,7 +14,7 @@ #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_XOPEN2K) #define __NR___syscall_chroot __NR_chroot -static inline _syscall1(int, __syscall_chroot, const char *, path); +static __inline__ _syscall1(int, __syscall_chroot, const char *, path); int chroot(const char *path) { diff --git a/libc/sysdeps/linux/common/create_module.c b/libc/sysdeps/linux/common/create_module.c index f15bb18c5..95ff900e0 100644 --- a/libc/sysdeps/linux/common/create_module.c +++ b/libc/sysdeps/linux/common/create_module.c @@ -19,7 +19,7 @@ unsigned long create_module(const char *name, size_t size); #if defined(__UCLIBC_BROKEN_CREATE_MODULE__) # define __NR___create_module __NR_create_module -static inline _syscall2(long, __create_module, const char *, name, size_t, size); +static __inline__ _syscall2(long, __create_module, const char *, name, size_t, size); /* By checking the value of errno, we know if we have been fooled * by the syscall2 macro making a very high address look like a * negative, so we we fix it up here. */ @@ -38,7 +38,7 @@ unsigned long create_module(const char *name, size_t size) # define __NR___create_module __NR_create_module /* Alpha doesn't have the same problem, exactly, but a bug in older kernels fails to clear the error flag. Clear it here explicitly. */ -static inline _syscall4(unsigned long, __create_module, const char *, name, +static __inline__ _syscall4(unsigned long, __create_module, const char *, name, size_t, size, size_t, dummy, size_t, err); unsigned long create_module(const char *name, size_t size) { diff --git a/libc/sysdeps/linux/common/fchmod.c b/libc/sysdeps/linux/common/fchmod.c index 72ec37a89..cb0058133 100644 --- a/libc/sysdeps/linux/common/fchmod.c +++ b/libc/sysdeps/linux/common/fchmod.c @@ -11,7 +11,7 @@ #include #define __NR___syscall_fchmod __NR_fchmod -static inline _syscall2(int, __syscall_fchmod, +static __inline__ _syscall2(int, __syscall_fchmod, int, fildes, __kernel_mode_t, mode); int fchmod(int fildes, mode_t mode) diff --git a/libc/sysdeps/linux/common/fchown.c b/libc/sysdeps/linux/common/fchown.c index e8d6eee48..31111ca54 100644 --- a/libc/sysdeps/linux/common/fchown.c +++ b/libc/sysdeps/linux/common/fchown.c @@ -22,7 +22,7 @@ _syscall3(int, fchown, int, fd, uid_t, owner, gid_t, group); #else # define __NR___syscall_fchown __NR_fchown -static inline _syscall3(int, __syscall_fchown, int, fd, +static __inline__ _syscall3(int, __syscall_fchown, int, fd, __kernel_uid_t, owner, __kernel_gid_t, group); int fchown(int fd, uid_t owner, gid_t group) diff --git a/libc/sysdeps/linux/common/flock.c b/libc/sysdeps/linux/common/flock.c index 8a4aa895d..9b275d031 100644 --- a/libc/sysdeps/linux/common/flock.c +++ b/libc/sysdeps/linux/common/flock.c @@ -11,7 +11,7 @@ #include #define __NR___syscall_flock __NR_flock -static inline _syscall2(int, __syscall_flock, int, fd, int, operation); +static __inline__ _syscall2(int, __syscall_flock, int, fd, int, operation); int flock(int fd, int operation) { diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c index 437c2d16b..fee750aa4 100644 --- a/libc/sysdeps/linux/common/fstat.c +++ b/libc/sysdeps/linux/common/fstat.c @@ -21,7 +21,7 @@ libc_hidden_proto(fstat) #define __NR___syscall_fstat __NR_fstat -static inline _syscall2(int, __syscall_fstat, int, fd, struct kernel_stat *, buf); +static __inline__ _syscall2(int, __syscall_fstat, int, fd, struct kernel_stat *, buf); int fstat(int fd, struct stat *buf) { diff --git a/libc/sysdeps/linux/common/fstat64.c b/libc/sysdeps/linux/common/fstat64.c index 215868d89..67c519a8b 100644 --- a/libc/sysdeps/linux/common/fstat64.c +++ b/libc/sysdeps/linux/common/fstat64.c @@ -17,7 +17,7 @@ libc_hidden_proto(fstat64) #define __NR___syscall_fstat64 __NR_fstat64 -static inline _syscall2(int, __syscall_fstat64, +static __inline__ _syscall2(int, __syscall_fstat64, int, filedes, struct kernel_stat64 *, buf); int fstat64(int fd, struct stat64 *buf) diff --git a/libc/sysdeps/linux/common/ftruncate64.c b/libc/sysdeps/linux/common/ftruncate64.c index cea9bc1bc..06d93e2f2 100644 --- a/libc/sysdeps/linux/common/ftruncate64.c +++ b/libc/sysdeps/linux/common/ftruncate64.c @@ -36,10 +36,10 @@ _syscall2(int, ftruncate64, int, fd, __off64_t, length); # define INLINE_SYSCALL(name, nr, args...) __syscall_ftruncate64 (args) # define __NR___syscall_ftruncate64 __NR_ftruncate64 # if defined(__UCLIBC_TRUNCATE64_HAS_4_ARGS__) -static inline _syscall4(int, __syscall_ftruncate64, int, fd, uint32_t, pad, +static __inline__ _syscall4(int, __syscall_ftruncate64, int, fd, uint32_t, pad, unsigned long, high_length, unsigned long, low_length); # else -static inline _syscall3(int, __syscall_ftruncate64, int, fd, +static __inline__ _syscall3(int, __syscall_ftruncate64, int, fd, unsigned long, high_length, unsigned long, low_length); # endif # endif diff --git a/libc/sysdeps/linux/common/getdents.c b/libc/sysdeps/linux/common/getdents.c index 8613e3a9b..45953f873 100644 --- a/libc/sysdeps/linux/common/getdents.c +++ b/libc/sysdeps/linux/common/getdents.c @@ -45,7 +45,7 @@ ssize_t __getdents (int fd, char *buf, size_t nbytes) attribute_hidden; libc_hidden_proto(lseek) #define __NR___syscall_getdents __NR_getdents -static inline _syscall3(int, __syscall_getdents, int, fd, unsigned char *, kdirp, size_t, count); +static __inline__ _syscall3(int, __syscall_getdents, int, fd, unsigned char *, kdirp, size_t, count); ssize_t __getdents (int fd, char *buf, size_t nbytes) { diff --git a/libc/sysdeps/linux/common/getdents64.c b/libc/sysdeps/linux/common/getdents64.c index 2328df29e..f7fbe1861 100644 --- a/libc/sysdeps/linux/common/getdents64.c +++ b/libc/sysdeps/linux/common/getdents64.c @@ -38,7 +38,7 @@ struct kernel_dirent64 # define __NR___syscall_getdents64 __NR_getdents64 -static inline _syscall3(int, __syscall_getdents64, int, fd, unsigned char *, dirp, size_t, count); +static __inline__ _syscall3(int, __syscall_getdents64, int, fd, unsigned char *, dirp, size_t, count); ssize_t __getdents64 (int fd, char *buf, size_t nbytes) attribute_hidden; ssize_t __getdents64 (int fd, char *buf, size_t nbytes) diff --git a/libc/sysdeps/linux/common/getegid.c b/libc/sysdeps/linux/common/getegid.c index 7c34b6c09..eaa708f15 100644 --- a/libc/sysdeps/linux/common/getegid.c +++ b/libc/sysdeps/linux/common/getegid.c @@ -19,7 +19,7 @@ _syscall0(gid_t, getegid); #elif defined(__NR_getegid) # define __NR___syscall_getegid __NR_getegid -static inline _syscall0(int, __syscall_getegid); +static __inline__ _syscall0(int, __syscall_getegid); gid_t getegid(void) { return (__syscall_getegid()); diff --git a/libc/sysdeps/linux/common/geteuid.c b/libc/sysdeps/linux/common/geteuid.c index d10c350e4..60151214d 100644 --- a/libc/sysdeps/linux/common/geteuid.c +++ b/libc/sysdeps/linux/common/geteuid.c @@ -19,7 +19,7 @@ _syscall0(uid_t, geteuid); #elif defined(__NR_geteuid) # define __NR___syscall_geteuid __NR_geteuid -static inline _syscall0(int, __syscall_geteuid); +static __inline__ _syscall0(int, __syscall_geteuid); uid_t geteuid(void) { return (__syscall_geteuid()); diff --git a/libc/sysdeps/linux/common/getgroups.c b/libc/sysdeps/linux/common/getgroups.c index 10da03ddd..7e1604294 100644 --- a/libc/sysdeps/linux/common/getgroups.c +++ b/libc/sysdeps/linux/common/getgroups.c @@ -28,7 +28,7 @@ libc_hidden_proto(sysconf) #define MIN(a,b) (((a)<(b))?(a):(b)) #define __NR___syscall_getgroups __NR_getgroups -static inline _syscall2(int, __syscall_getgroups, +static __inline__ _syscall2(int, __syscall_getgroups, int, size, __kernel_gid_t *, list); int getgroups(int size, gid_t groups[]) diff --git a/libc/sysdeps/linux/common/getpgid.c b/libc/sysdeps/linux/common/getpgid.c index 49f780adf..25ff12907 100644 --- a/libc/sysdeps/linux/common/getpgid.c +++ b/libc/sysdeps/linux/common/getpgid.c @@ -13,7 +13,7 @@ #include #define __NR___syscall_getpgid __NR_getpgid -static inline _syscall1(__kernel_pid_t, __syscall_getpgid, __kernel_pid_t, pid); +static __inline__ _syscall1(__kernel_pid_t, __syscall_getpgid, __kernel_pid_t, pid); pid_t getpgid(pid_t pid) { diff --git a/libc/sysdeps/linux/common/getpriority.c b/libc/sysdeps/linux/common/getpriority.c index b66b1ea15..bdfc723e6 100644 --- a/libc/sysdeps/linux/common/getpriority.c +++ b/libc/sysdeps/linux/common/getpriority.c @@ -13,7 +13,7 @@ libc_hidden_proto(getpriority) #define __NR___syscall_getpriority __NR_getpriority -static inline _syscall2(int, __syscall_getpriority, +static __inline__ _syscall2(int, __syscall_getpriority, __priority_which_t, which, id_t, who); /* The return value of __syscall_getpriority is biased by this value diff --git a/libc/sysdeps/linux/common/getresgid.c b/libc/sysdeps/linux/common/getresgid.c index 9c2d13ba9..922874a3d 100644 --- a/libc/sysdeps/linux/common/getresgid.c +++ b/libc/sysdeps/linux/common/getresgid.c @@ -18,7 +18,7 @@ _syscall3(int, getresgid, gid_t *, rgid, gid_t *, egid, gid_t *, sgid) #elif defined(__NR_getresgid) # define __NR___syscall_getresgid __NR_getresgid -static inline _syscall3(int, __syscall_getresgid, __kernel_gid_t *, rgid, +static __inline__ _syscall3(int, __syscall_getresgid, __kernel_gid_t *, rgid, __kernel_gid_t *, egid, __kernel_gid_t *, sgid); int getresgid(gid_t * rgid, gid_t * egid, gid_t * sgid) diff --git a/libc/sysdeps/linux/common/getresuid.c b/libc/sysdeps/linux/common/getresuid.c index dbc8df903..5a070cc42 100644 --- a/libc/sysdeps/linux/common/getresuid.c +++ b/libc/sysdeps/linux/common/getresuid.c @@ -18,7 +18,7 @@ _syscall3(int, getresuid, uid_t *, ruid, uid_t *, euid, uid_t *, suid) #elif defined(__NR_getresuid) # define __NR___syscall_getresuid __NR_getresuid -static inline _syscall3(int, __syscall_getresuid, __kernel_uid_t *, ruid, +static __inline__ _syscall3(int, __syscall_getresuid, __kernel_uid_t *, ruid, __kernel_uid_t *, euid, __kernel_uid_t *, suid); int getresuid(uid_t * ruid, uid_t * euid, uid_t * suid) diff --git a/libc/sysdeps/linux/common/getsid.c b/libc/sysdeps/linux/common/getsid.c index 398851873..9743a976f 100644 --- a/libc/sysdeps/linux/common/getsid.c +++ b/libc/sysdeps/linux/common/getsid.c @@ -14,7 +14,7 @@ libc_hidden_proto(getsid) #define __NR___syscall_getsid __NR_getsid -static inline _syscall1(__kernel_pid_t, __syscall_getsid, __kernel_pid_t, pid); +static __inline__ _syscall1(__kernel_pid_t, __syscall_getsid, __kernel_pid_t, pid); pid_t getsid(pid_t pid) { diff --git a/libc/sysdeps/linux/common/kill.c b/libc/sysdeps/linux/common/kill.c index 46eabf0c9..c7729113b 100644 --- a/libc/sysdeps/linux/common/kill.c +++ b/libc/sysdeps/linux/common/kill.c @@ -13,7 +13,7 @@ libc_hidden_proto(kill) #define __NR___syscall_kill __NR_kill -static inline _syscall2(int, __syscall_kill, __kernel_pid_t, pid, int, sig); +static __inline__ _syscall2(int, __syscall_kill, __kernel_pid_t, pid, int, sig); int kill(pid_t pid, int sig) { diff --git a/libc/sysdeps/linux/common/klogctl.c b/libc/sysdeps/linux/common/klogctl.c index 81451022e..e378e3e67 100644 --- a/libc/sysdeps/linux/common/klogctl.c +++ b/libc/sysdeps/linux/common/klogctl.c @@ -11,7 +11,7 @@ #include #include #define __NR__syslog __NR_syslog -static inline _syscall3(int, _syslog, int, type, char *, buf, int, len); +static __inline__ _syscall3(int, _syslog, int, type, char *, buf, int, len); int klogctl(int type, char *buf, int len) { return (_syslog(type, buf, len)); diff --git a/libc/sysdeps/linux/common/lchown.c b/libc/sysdeps/linux/common/lchown.c index 8095c941e..08c686fd6 100644 --- a/libc/sysdeps/linux/common/lchown.c +++ b/libc/sysdeps/linux/common/lchown.c @@ -22,7 +22,7 @@ _syscall3(int, lchown, const char *, path, uid_t, owner, gid_t, group); #else # define __NR___syscall_lchown __NR_lchown -static inline _syscall3(int, __syscall_lchown, const char *, path, +static __inline__ _syscall3(int, __syscall_lchown, const char *, path, __kernel_uid_t, owner, __kernel_gid_t, group); int lchown(const char *path, uid_t owner, gid_t group) diff --git a/libc/sysdeps/linux/common/llseek.c b/libc/sysdeps/linux/common/llseek.c index ea72dc4f3..2e7fb976e 100644 --- a/libc/sysdeps/linux/common/llseek.c +++ b/libc/sysdeps/linux/common/llseek.c @@ -18,7 +18,7 @@ extern __typeof(lseek64) __libc_lseek64; # ifndef INLINE_SYSCALL # define INLINE_SYSCALL(name, nr, args...) __syscall_llseek (args) # define __NR___syscall_llseek __NR__llseek -static inline _syscall5(int, __syscall_llseek, int, fd, off_t, offset_hi, +static __inline__ _syscall5(int, __syscall_llseek, int, fd, off_t, offset_hi, off_t, offset_lo, loff_t *, result, int, whence); # endif diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c index 379ffd30d..4707dfc7c 100644 --- a/libc/sysdeps/linux/common/lstat.c +++ b/libc/sysdeps/linux/common/lstat.c @@ -21,7 +21,7 @@ libc_hidden_proto(lstat) #define __NR___syscall_lstat __NR_lstat -static inline _syscall2(int, __syscall_lstat, +static __inline__ _syscall2(int, __syscall_lstat, const char *, file_name, struct kernel_stat *, buf); int lstat(const char *file_name, struct stat *buf) diff --git a/libc/sysdeps/linux/common/lstat64.c b/libc/sysdeps/linux/common/lstat64.c index 1c392636f..6777dff6a 100644 --- a/libc/sysdeps/linux/common/lstat64.c +++ b/libc/sysdeps/linux/common/lstat64.c @@ -17,7 +17,7 @@ libc_hidden_proto(lstat64) # define __NR___syscall_lstat64 __NR_lstat64 -static inline _syscall2(int, __syscall_lstat64, const char *, file_name, +static __inline__ _syscall2(int, __syscall_lstat64, const char *, file_name, struct kernel_stat64 *, buf); int lstat64(const char *file_name, struct stat64 *buf) diff --git a/libc/sysdeps/linux/common/mkdir.c b/libc/sysdeps/linux/common/mkdir.c index 1d7238456..ab3cbfee5 100644 --- a/libc/sysdeps/linux/common/mkdir.c +++ b/libc/sysdeps/linux/common/mkdir.c @@ -13,7 +13,7 @@ libc_hidden_proto(mkdir) #define __NR___syscall_mkdir __NR_mkdir -static inline _syscall2(int, __syscall_mkdir, const char *, pathname, +static __inline__ _syscall2(int, __syscall_mkdir, const char *, pathname, __kernel_mode_t, mode); int mkdir(const char *pathname, mode_t mode) diff --git a/libc/sysdeps/linux/common/mknod.c b/libc/sysdeps/linux/common/mknod.c index 02b3822f8..75aff70c8 100644 --- a/libc/sysdeps/linux/common/mknod.c +++ b/libc/sysdeps/linux/common/mknod.c @@ -14,7 +14,7 @@ libc_hidden_proto(mknod) #define __NR___syscall_mknod __NR_mknod -static inline _syscall3(int, __syscall_mknod, const char *, path, +static __inline__ _syscall3(int, __syscall_mknod, const char *, path, __kernel_mode_t, mode, __kernel_dev_t, dev); int mknod(const char *path, mode_t mode, dev_t dev) diff --git a/libc/sysdeps/linux/common/mmap.c b/libc/sysdeps/linux/common/mmap.c index f40554ebb..7645565a2 100644 --- a/libc/sysdeps/linux/common/mmap.c +++ b/libc/sysdeps/linux/common/mmap.c @@ -24,7 +24,7 @@ _syscall6(void *, mmap, void *, start, size_t, length, #else # define __NR__mmap __NR_mmap -static inline _syscall1(__ptr_t, _mmap, unsigned long *, buffer); +static __inline__ _syscall1(__ptr_t, _mmap, unsigned long *, buffer); __ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offset) { @@ -48,7 +48,7 @@ libc_hidden_def(mmap) libc_hidden_proto(mmap) #define __NR___syscall_mmap2 __NR_mmap2 -static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, +static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, off_t, offset); /* Some architectures always use 12 as page shift for mmap2() eventhough the diff --git a/libc/sysdeps/linux/common/mmap64.c b/libc/sysdeps/linux/common/mmap64.c index 8c0518d1d..a1aa19fb8 100644 --- a/libc/sysdeps/linux/common/mmap64.c +++ b/libc/sysdeps/linux/common/mmap64.c @@ -41,7 +41,7 @@ __ptr_t mmap64(__ptr_t addr, size_t len, int prot, int flags, int fd, __off64_t # else # define __NR___syscall_mmap2 __NR_mmap2 -static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, +static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, off_t, offset); /* Some architectures always use 12 as page shift for mmap2() eventhough the diff --git a/libc/sysdeps/linux/common/nice.c b/libc/sysdeps/linux/common/nice.c index 393ffef4e..8ced60915 100644 --- a/libc/sysdeps/linux/common/nice.c +++ b/libc/sysdeps/linux/common/nice.c @@ -17,7 +17,7 @@ libc_hidden_proto(getpriority) #ifdef __NR_nice # define __NR___syscall_nice __NR_nice -static inline _syscall1(int, __syscall_nice, int, incr); +static __inline__ _syscall1(int, __syscall_nice, int, incr); #else @@ -25,7 +25,7 @@ static inline _syscall1(int, __syscall_nice, int, incr); libc_hidden_proto(setpriority) -static inline int int_add_no_wrap(int a, int b) +static __inline__ int int_add_no_wrap(int a, int b) { int s = a + b; @@ -38,7 +38,7 @@ static inline int int_add_no_wrap(int a, int b) return s; } -static inline int __syscall_nice(int incr) +static __inline__ int __syscall_nice(int incr) { int old_priority; # if 1 diff --git a/libc/sysdeps/linux/common/open.c b/libc/sysdeps/linux/common/open.c index b4bef3c63..7c0566b46 100644 --- a/libc/sysdeps/linux/common/open.c +++ b/libc/sysdeps/linux/common/open.c @@ -18,7 +18,7 @@ extern __typeof(open) __libc_open; extern __typeof(creat) __libc_creat; #define __NR___syscall_open __NR_open -static inline _syscall3(int, __syscall_open, const char *, file, +static __inline__ _syscall3(int, __syscall_open, const char *, file, int, flags, __kernel_mode_t, mode); libc_hidden_proto(__libc_open) diff --git a/libc/sysdeps/linux/common/posix_fadvise64.c b/libc/sysdeps/linux/common/posix_fadvise64.c index 7944c4985..5d8ed65b6 100644 --- a/libc/sysdeps/linux/common/posix_fadvise64.c +++ b/libc/sysdeps/linux/common/posix_fadvise64.c @@ -49,7 +49,7 @@ _syscall4(int, posix_fadvise64, int, fd, __off64_t, offset, #ifdef _syscall6 /* workaround until everyone has _syscall6() */ #define __NR___syscall_fadvise64_64 __NR_fadvise64_64 -static inline _syscall6(int, __syscall_fadvise64_64, int, fd, +static __inline__ _syscall6(int, __syscall_fadvise64_64, int, fd, unsigned long, high_offset, unsigned long, low_offset, unsigned long, high_len, unsigned long, low_len, int, advice); diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c index 3c0df19a3..b2aaa2a1d 100644 --- a/libc/sysdeps/linux/common/pread_write.c +++ b/libc/sysdeps/linux/common/pread_write.c @@ -30,7 +30,7 @@ extern __typeof(pwrite64) __libc_pwrite64; #ifdef __NR_pread # define __NR___syscall_pread __NR_pread -static inline _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf, +static __inline__ _syscall5(ssize_t, __syscall_pread, int, fd, void *, buf, size_t, count, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) @@ -54,7 +54,7 @@ weak_alias(__libc_pread64,pread64) #ifdef __NR_pwrite # define __NR___syscall_pwrite __NR_pwrite -static inline _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf, +static __inline__ _syscall5(ssize_t, __syscall_pwrite, int, fd, const void *, buf, size_t, count, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) diff --git a/libc/sysdeps/linux/common/ptrace.c b/libc/sysdeps/linux/common/ptrace.c index 9d6767374..4f11260b8 100644 --- a/libc/sysdeps/linux/common/ptrace.c +++ b/libc/sysdeps/linux/common/ptrace.c @@ -12,7 +12,7 @@ #if defined __NR_ptrace && defined __USE_BSD && defined __USE_MISC #define __NR___syscall_ptrace __NR_ptrace -static inline _syscall4(long, __syscall_ptrace, enum __ptrace_request, request, +static __inline__ _syscall4(long, __syscall_ptrace, enum __ptrace_request, request, __kernel_pid_t, pid, void*, addr, void*, data); long int diff --git a/libc/sysdeps/linux/common/readahead.c b/libc/sysdeps/linux/common/readahead.c index ae7a57c44..94e2481cf 100644 --- a/libc/sysdeps/linux/common/readahead.c +++ b/libc/sysdeps/linux/common/readahead.c @@ -33,7 +33,7 @@ # if __WORDSIZE == 64 -static inline _syscall3(ssize_t, __readahead, int, fd, +static __inline__ _syscall3(ssize_t, __readahead, int, fd, off_t, offset, size_t, count); ssize_t readahead(int fd, off_t offset, size_t count) @@ -43,7 +43,7 @@ ssize_t readahead(int fd, off_t offset, size_t count) # else -static inline _syscall4(ssize_t, __readahead, int, fd, +static __inline__ _syscall4(ssize_t, __readahead, int, fd, off_t, high_offset, off_t, low_offset, size_t, count); ssize_t readahead(int fd, off64_t offset, size_t count) diff --git a/libc/sysdeps/linux/common/reboot.c b/libc/sysdeps/linux/common/reboot.c index 44828ce64..9ce57b1ec 100644 --- a/libc/sysdeps/linux/common/reboot.c +++ b/libc/sysdeps/linux/common/reboot.c @@ -10,7 +10,7 @@ #include #include #define __NR__reboot __NR_reboot -static inline _syscall3(int, _reboot, int, magic, int, magic2, int, flag); +static __inline__ _syscall3(int, _reboot, int, magic, int, magic2, int, flag); int reboot(int flag) { return (_reboot((int) 0xfee1dead, 672274793, flag)); diff --git a/libc/sysdeps/linux/common/rename.c b/libc/sysdeps/linux/common/rename.c index 7e88bf346..fd7318f02 100644 --- a/libc/sysdeps/linux/common/rename.c +++ b/libc/sysdeps/linux/common/rename.c @@ -14,7 +14,7 @@ #include #define __NR___syscall_rename __NR_rename -static inline _syscall2(int, __syscall_rename, const char *, oldpath, +static __inline__ _syscall2(int, __syscall_rename, const char *, oldpath, const char *, newpath); int rename(const char * oldpath, const char * newpath) diff --git a/libc/sysdeps/linux/common/sched_getaffinity.c b/libc/sysdeps/linux/common/sched_getaffinity.c index b876cf932..5c801c68f 100644 --- a/libc/sysdeps/linux/common/sched_getaffinity.c +++ b/libc/sysdeps/linux/common/sched_getaffinity.c @@ -30,7 +30,7 @@ /* Experimentally off - libc_hidden_proto(memset) */ #define __NR___syscall_sched_getaffinity __NR_sched_getaffinity -static inline _syscall3(int, __syscall_sched_getaffinity, __kernel_pid_t, pid, +static __inline__ _syscall3(int, __syscall_sched_getaffinity, __kernel_pid_t, pid, size_t, cpusetsize, cpu_set_t *, cpuset); int sched_getaffinity(pid_t pid, size_t cpusetsize, cpu_set_t *cpuset) diff --git a/libc/sysdeps/linux/common/sched_getparam.c b/libc/sysdeps/linux/common/sched_getparam.c index 117c6baa2..af5ba6071 100644 --- a/libc/sysdeps/linux/common/sched_getparam.c +++ b/libc/sysdeps/linux/common/sched_getparam.c @@ -12,7 +12,7 @@ #include #define __NR___syscall_sched_getparam __NR_sched_getparam -static inline _syscall2(int, __syscall_sched_getparam, +static __inline__ _syscall2(int, __syscall_sched_getparam, __kernel_pid_t, pid, struct sched_param *, p); int sched_getparam(pid_t pid, struct sched_param *p) diff --git a/libc/sysdeps/linux/common/sched_getscheduler.c b/libc/sysdeps/linux/common/sched_getscheduler.c index 89ecdf911..9564da7fd 100644 --- a/libc/sysdeps/linux/common/sched_getscheduler.c +++ b/libc/sysdeps/linux/common/sched_getscheduler.c @@ -12,7 +12,7 @@ #include #define __NR___syscall_sched_getscheduler __NR_sched_getscheduler -static inline _syscall1(int, __syscall_sched_getscheduler, __kernel_pid_t, pid); +static __inline__ _syscall1(int, __syscall_sched_getscheduler, __kernel_pid_t, pid); int sched_getscheduler(pid_t pid) { diff --git a/libc/sysdeps/linux/common/sched_rr_get_interval.c b/libc/sysdeps/linux/common/sched_rr_get_interval.c index a87d27fd2..c59812d94 100644 --- a/libc/sysdeps/linux/common/sched_rr_get_interval.c +++ b/libc/sysdeps/linux/common/sched_rr_get_interval.c @@ -12,7 +12,7 @@ #include #define __NR___syscall_sched_rr_get_interval __NR_sched_rr_get_interval -static inline _syscall2(int, __syscall_sched_rr_get_interval, +static __inline__ _syscall2(int, __syscall_sched_rr_get_interval, __kernel_pid_t, pid, struct timespec *, tp); int sched_rr_get_interval(pid_t pid, struct timespec *tp) diff --git a/libc/sysdeps/linux/common/sched_setaffinity.c b/libc/sysdeps/linux/common/sched_setaffinity.c index a25fbe356..c687970f1 100644 --- a/libc/sysdeps/linux/common/sched_setaffinity.c +++ b/libc/sysdeps/linux/common/sched_setaffinity.c @@ -34,7 +34,7 @@ libc_hidden_proto(getpid) #define __NR___syscall_sched_setaffinity __NR_sched_setaffinity -static inline _syscall3(int, __syscall_sched_setaffinity, __kernel_pid_t, pid, +static __inline__ _syscall3(int, __syscall_sched_setaffinity, __kernel_pid_t, pid, size_t, cpusetsize, cpu_set_t *, cpuset); static size_t __kernel_cpumask_size; diff --git a/libc/sysdeps/linux/common/sched_setparam.c b/libc/sysdeps/linux/common/sched_setparam.c index 94a3cee54..1e1f8cf2d 100644 --- a/libc/sysdeps/linux/common/sched_setparam.c +++ b/libc/sysdeps/linux/common/sched_setparam.c @@ -12,7 +12,7 @@ #include #define __NR___syscall_sched_setparam __NR_sched_setparam -static inline _syscall2(int, __syscall_sched_setparam, +static __inline__ _syscall2(int, __syscall_sched_setparam, __kernel_pid_t, pid, const struct sched_param *, p); int sched_setparam(pid_t pid, const struct sched_param *p) diff --git a/libc/sysdeps/linux/common/sched_setscheduler.c b/libc/sysdeps/linux/common/sched_setscheduler.c index 05ada79e5..fe2630871 100644 --- a/libc/sysdeps/linux/common/sched_setscheduler.c +++ b/libc/sysdeps/linux/common/sched_setscheduler.c @@ -12,7 +12,7 @@ #include #define __NR___syscall_sched_setscheduler __NR_sched_setscheduler -static inline _syscall3(int, __syscall_sched_setscheduler, +static __inline__ _syscall3(int, __syscall_sched_setscheduler, __kernel_pid_t, pid, int, policy, const struct sched_param *, p); int sched_setscheduler(pid_t pid, int policy, const struct sched_param *p) diff --git a/libc/sysdeps/linux/common/setfsgid.c b/libc/sysdeps/linux/common/setfsgid.c index b35006306..de005e28d 100644 --- a/libc/sysdeps/linux/common/setfsgid.c +++ b/libc/sysdeps/linux/common/setfsgid.c @@ -22,7 +22,7 @@ _syscall1(int, setfsgid, gid_t, gid); #else # define __NR___syscall_setfsgid __NR_setfsgid -static inline _syscall1(int, __syscall_setfsgid, __kernel_gid_t, gid); +static __inline__ _syscall1(int, __syscall_setfsgid, __kernel_gid_t, gid); int setfsgid(gid_t gid) { diff --git a/libc/sysdeps/linux/common/setfsuid.c b/libc/sysdeps/linux/common/setfsuid.c index d302ad48c..698117a1a 100644 --- a/libc/sysdeps/linux/common/setfsuid.c +++ b/libc/sysdeps/linux/common/setfsuid.c @@ -22,7 +22,7 @@ _syscall1(int, setfsuid, uid_t, uid); #else # define __NR___syscall_setfsuid __NR_setfsuid -static inline _syscall1(int, __syscall_setfsuid, __kernel_uid_t, uid); +static __inline__ _syscall1(int, __syscall_setfsuid, __kernel_uid_t, uid); int setfsuid(uid_t uid) { diff --git a/libc/sysdeps/linux/common/setgid.c b/libc/sysdeps/linux/common/setgid.c index 4a924a047..37175cd7c 100644 --- a/libc/sysdeps/linux/common/setgid.c +++ b/libc/sysdeps/linux/common/setgid.c @@ -22,7 +22,7 @@ _syscall1(int, setgid, gid_t, gid); #else # define __NR___syscall_setgid __NR_setgid -static inline _syscall1(int, __syscall_setgid, __kernel_gid_t, gid); +static __inline__ _syscall1(int, __syscall_setgid, __kernel_gid_t, gid); int setgid(gid_t gid) { diff --git a/libc/sysdeps/linux/common/setgroups.c b/libc/sysdeps/linux/common/setgroups.c index eb5245d59..3c77250d0 100644 --- a/libc/sysdeps/linux/common/setgroups.c +++ b/libc/sysdeps/linux/common/setgroups.c @@ -29,7 +29,7 @@ _syscall2(int, setgroups, size_t, size, const gid_t *, list); libc_hidden_proto(sysconf) #define __NR___syscall_setgroups __NR_setgroups -static inline _syscall2(int, __syscall_setgroups, +static __inline__ _syscall2(int, __syscall_setgroups, size_t, size, const __kernel_gid_t *, list); int setgroups(size_t size, const gid_t *groups) diff --git a/libc/sysdeps/linux/common/setpgid.c b/libc/sysdeps/linux/common/setpgid.c index 3447b999d..f91908ded 100644 --- a/libc/sysdeps/linux/common/setpgid.c +++ b/libc/sysdeps/linux/common/setpgid.c @@ -15,7 +15,7 @@ libc_hidden_proto(setpgid) #define __NR___syscall_setpgid __NR_setpgid -static inline _syscall2(int, __syscall_setpgid, +static __inline__ _syscall2(int, __syscall_setpgid, __kernel_pid_t, pid, __kernel_pid_t, pgid); int setpgid(pid_t pid, pid_t pgid) diff --git a/libc/sysdeps/linux/common/setregid.c b/libc/sysdeps/linux/common/setregid.c index d56c01f64..3fe95d9d0 100644 --- a/libc/sysdeps/linux/common/setregid.c +++ b/libc/sysdeps/linux/common/setregid.c @@ -24,7 +24,7 @@ _syscall2(int, setregid, gid_t, rgid, gid_t, egid); #else # define __NR___syscall_setregid __NR_setregid -static inline _syscall2(int, __syscall_setregid, +static __inline__ _syscall2(int, __syscall_setregid, __kernel_gid_t, rgid, __kernel_gid_t, egid); int setregid(gid_t rgid, gid_t egid) diff --git a/libc/sysdeps/linux/common/setresgid.c b/libc/sysdeps/linux/common/setresgid.c index 3bb54e3aa..13e4b1d6d 100644 --- a/libc/sysdeps/linux/common/setresgid.c +++ b/libc/sysdeps/linux/common/setresgid.c @@ -22,7 +22,7 @@ libc_hidden_def(setresgid) #elif defined(__NR_setresgid) # define __NR___syscall_setresgid __NR_setresgid -static inline _syscall3(int, __syscall_setresgid, +static __inline__ _syscall3(int, __syscall_setresgid, __kernel_gid_t, rgid, __kernel_gid_t, egid, __kernel_gid_t, sgid); libc_hidden_proto(setresgid) diff --git a/libc/sysdeps/linux/common/setresuid.c b/libc/sysdeps/linux/common/setresuid.c index 54b92465c..764b90523 100644 --- a/libc/sysdeps/linux/common/setresuid.c +++ b/libc/sysdeps/linux/common/setresuid.c @@ -22,7 +22,7 @@ libc_hidden_def(setresuid) #elif defined(__NR_setresuid) # define __NR___syscall_setresuid __NR_setresuid -static inline _syscall3(int, __syscall_setresuid, +static __inline__ _syscall3(int, __syscall_setresuid, __kernel_uid_t, rgid, __kernel_uid_t, egid, __kernel_uid_t, sgid); libc_hidden_proto(setresuid) diff --git a/libc/sysdeps/linux/common/setreuid.c b/libc/sysdeps/linux/common/setreuid.c index 7f908a333..bca7f8f43 100644 --- a/libc/sysdeps/linux/common/setreuid.c +++ b/libc/sysdeps/linux/common/setreuid.c @@ -24,7 +24,7 @@ _syscall2(int, setreuid, uid_t, ruid, uid_t, euid); #else # define __NR___syscall_setreuid __NR_setreuid -static inline _syscall2(int, __syscall_setreuid, +static __inline__ _syscall2(int, __syscall_setreuid, __kernel_uid_t, ruid, __kernel_uid_t, euid); int setreuid(uid_t ruid, uid_t euid) diff --git a/libc/sysdeps/linux/common/setuid.c b/libc/sysdeps/linux/common/setuid.c index 4036a3d09..32a4cd79e 100644 --- a/libc/sysdeps/linux/common/setuid.c +++ b/libc/sysdeps/linux/common/setuid.c @@ -22,7 +22,7 @@ _syscall1(int, setuid, uid_t, uid); #else # define __NR___syscall_setuid __NR_setuid -static inline _syscall1(int, __syscall_setuid, __kernel_uid_t, uid); +static __inline__ _syscall1(int, __syscall_setuid, __kernel_uid_t, uid); int setuid(uid_t uid) { diff --git a/libc/sysdeps/linux/common/sigpending.c b/libc/sysdeps/linux/common/sigpending.c index fa272c0f5..0a74afaa4 100644 --- a/libc/sysdeps/linux/common/sigpending.c +++ b/libc/sysdeps/linux/common/sigpending.c @@ -15,7 +15,7 @@ #ifdef __NR_rt_sigpending # define __NR___rt_sigpending __NR_rt_sigpending -static inline _syscall2(int, __rt_sigpending, sigset_t *, set, size_t, size); +static __inline__ _syscall2(int, __rt_sigpending, sigset_t *, set, size_t, size); int sigpending(sigset_t * set) { diff --git a/libc/sysdeps/linux/common/sigqueue.c b/libc/sysdeps/linux/common/sigqueue.c index 5d8e852fe..2bff597c1 100644 --- a/libc/sysdeps/linux/common/sigqueue.c +++ b/libc/sysdeps/linux/common/sigqueue.c @@ -31,7 +31,7 @@ libc_hidden_proto(getuid) #ifdef __NR_rt_sigqueueinfo # define __NR___libc_rt_sigqueueinfo __NR_rt_sigqueueinfo -static inline _syscall3(int, __libc_rt_sigqueueinfo, pid_t, pid, int, sig, void*, value); +static __inline__ _syscall3(int, __libc_rt_sigqueueinfo, pid_t, pid, int, sig, void*, value); /* Return any pending signal or wait for one for the given time. */ int sigqueue (pid_t pid, int sig, const union sigval val) diff --git a/libc/sysdeps/linux/common/sigsuspend.c b/libc/sysdeps/linux/common/sigsuspend.c index 81bbbeec4..8495e35b5 100644 --- a/libc/sysdeps/linux/common/sigsuspend.c +++ b/libc/sysdeps/linux/common/sigsuspend.c @@ -16,7 +16,7 @@ extern __typeof(sigsuspend) __libc_sigsuspend; #ifdef __NR_rt_sigsuspend # define __NR___rt_sigsuspend __NR_rt_sigsuspend -static inline _syscall2(int, __rt_sigsuspend, const sigset_t *, mask, size_t, size); +static __inline__ _syscall2(int, __rt_sigsuspend, const sigset_t *, mask, size_t, size); int __libc_sigsuspend(const sigset_t * mask) { @@ -24,7 +24,7 @@ int __libc_sigsuspend(const sigset_t * mask) } #else # define __NR___syscall_sigsuspend __NR_sigsuspend -static inline _syscall3(int, __syscall_sigsuspend, int, a, unsigned long int, b, +static __inline__ _syscall3(int, __syscall_sigsuspend, int, a, unsigned long int, b, unsigned long int, c); int __libc_sigsuspend(const sigset_t * set) diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c index bbb070dbe..78211334e 100644 --- a/libc/sysdeps/linux/common/stat.c +++ b/libc/sysdeps/linux/common/stat.c @@ -22,7 +22,7 @@ libc_hidden_proto(stat) #define __NR___syscall_stat __NR_stat #undef stat -static inline _syscall2(int, __syscall_stat, +static __inline__ _syscall2(int, __syscall_stat, const char *, file_name, struct kernel_stat *, buf); int stat(const char *file_name, struct stat *buf) diff --git a/libc/sysdeps/linux/common/stat64.c b/libc/sysdeps/linux/common/stat64.c index 1ef39de4a..1a0865686 100644 --- a/libc/sysdeps/linux/common/stat64.c +++ b/libc/sysdeps/linux/common/stat64.c @@ -18,7 +18,7 @@ libc_hidden_proto(stat64) # include # include "xstatconv.h" -static inline _syscall2(int, __syscall_stat64, +static __inline__ _syscall2(int, __syscall_stat64, const char *, file_name, struct kernel_stat64 *, buf); int stat64(const char *file_name, struct stat64 *buf) diff --git a/libc/sysdeps/linux/common/sync.c b/libc/sysdeps/linux/common/sync.c index dd69e335b..2c8287cf0 100644 --- a/libc/sysdeps/linux/common/sync.c +++ b/libc/sysdeps/linux/common/sync.c @@ -15,7 +15,7 @@ #ifndef INLINE_SYSCALL #define INLINE_SYSCALL(name, nr, args...) __syscall_sync (args) #define __NR___syscall_sync __NR_sync -static inline _syscall0(void, __syscall_sync); +static __inline__ _syscall0(void, __syscall_sync); #endif void sync(void) diff --git a/libc/sysdeps/linux/common/truncate64.c b/libc/sysdeps/linux/common/truncate64.c index 53c46fc56..caca7080e 100644 --- a/libc/sysdeps/linux/common/truncate64.c +++ b/libc/sysdeps/linux/common/truncate64.c @@ -33,10 +33,10 @@ _syscall2(int, truncate64, const char *, path, __off64_t, length); #define INLINE_SYSCALL(name, nr, args...) __syscall_truncate64 (args) #define __NR___syscall_truncate64 __NR_truncate64 #if defined(__UCLIBC_TRUNCATE64_HAS_4_ARGS__) -static inline _syscall4(int, __syscall_truncate64, const char *, path, +static __inline__ _syscall4(int, __syscall_truncate64, const char *, path, uint32_t, pad, unsigned long, high_length, unsigned long, low_length); #else -static inline _syscall3(int, __syscall_truncate64, const char *, path, +static __inline__ _syscall3(int, __syscall_truncate64, const char *, path, unsigned long, high_length, unsigned long, low_length); #endif #endif diff --git a/libc/sysdeps/linux/common/umask.c b/libc/sysdeps/linux/common/umask.c index 24297e07e..01a7b9eb3 100644 --- a/libc/sysdeps/linux/common/umask.c +++ b/libc/sysdeps/linux/common/umask.c @@ -11,7 +11,7 @@ #include #define __NR___syscall_umask __NR_umask -static inline _syscall1(__kernel_mode_t, __syscall_umask, __kernel_mode_t, mode); +static __inline__ _syscall1(__kernel_mode_t, __syscall_umask, __kernel_mode_t, mode); mode_t umask(mode_t mode) { diff --git a/libc/sysdeps/linux/common/umount.c b/libc/sysdeps/linux/common/umount.c index c62f9fb7c..9090696d5 100644 --- a/libc/sysdeps/linux/common/umount.c +++ b/libc/sysdeps/linux/common/umount.c @@ -21,7 +21,7 @@ _syscall1(int, umount, const char *, specialfile); #elif defined __NR_umount2 # define __NR___syscall_umount2 __NR_umount2 -static inline _syscall2(int, __syscall_umount2, const char *, special_file, int, flags); +static __inline__ _syscall2(int, __syscall_umount2, const char *, special_file, int, flags); int umount(const char *special_file) { diff --git a/libc/sysdeps/linux/common/ustat.c b/libc/sysdeps/linux/common/ustat.c index 27cfa95ad..578763cb5 100644 --- a/libc/sysdeps/linux/common/ustat.c +++ b/libc/sysdeps/linux/common/ustat.c @@ -12,7 +12,7 @@ #include #define __NR___syscall_ustat __NR_ustat -static inline _syscall2(int, __syscall_ustat, +static __inline__ _syscall2(int, __syscall_ustat, unsigned short int, kdev_t, struct ustat *, ubuf); int ustat(dev_t dev, struct ustat *ubuf) diff --git a/libc/sysdeps/linux/common/wait4.c b/libc/sysdeps/linux/common/wait4.c index ff3b82645..5c51116fa 100644 --- a/libc/sysdeps/linux/common/wait4.c +++ b/libc/sysdeps/linux/common/wait4.c @@ -15,7 +15,7 @@ libc_hidden_proto(wait4) #define __NR___syscall_wait4 __NR_wait4 -static inline _syscall4(int, __syscall_wait4, __kernel_pid_t, pid, +static __inline__ _syscall4(int, __syscall_wait4, __kernel_pid_t, pid, int *, status, int, opts, struct rusage *, rusage); pid_t wait4(pid_t pid, int *status, int opts, struct rusage *rusage) diff --git a/libc/sysdeps/linux/e1/bits/fenvinline.h b/libc/sysdeps/linux/e1/bits/fenvinline.h index cce266131..2723a35f6 100644 --- a/libc/sysdeps/linux/e1/bits/fenvinline.h +++ b/libc/sysdeps/linux/e1/bits/fenvinline.h @@ -92,7 +92,7 @@ /* The following functions test for accrued exceptions. * No trap is generated on an FP exception. */ -static inline feclearexcept(int __excepts) +static __inline__ feclearexcept(int __excepts) { unsigned int enabled_excepts, disabled_excepts; @@ -152,7 +152,7 @@ inline int fetestexcept(int __excepts) return ( G2en | (G2dis << 8) ); } -static inline int feraiseexcept(int __excepts) +static __inline__ int feraiseexcept(int __excepts) { __asm__ __volatile__("or G2, %0" :/*no output*/ @@ -218,7 +218,7 @@ static inline int feraiseexcept(int __excepts) (__retval); \ }) -static inline int fegetexcept(int excepts) +static __inline__ int fegetexcept(int excepts) { unsigned int tmp; __asm__ __volatile__("mov %0, SR" @@ -228,7 +228,7 @@ static inline int fegetexcept(int excepts) return tmp; } -static inline int fegetenv(fenv_t *envp) +static __inline__ int fegetenv(fenv_t *envp) { __asm__ __volatile__("mov %0, SR\n\t mov %1, SR\n\t diff --git a/libc/sysdeps/linux/e1/longjmp.c b/libc/sysdeps/linux/e1/longjmp.c index fbd5103a4..e60c28c52 100644 --- a/libc/sysdeps/linux/e1/longjmp.c +++ b/libc/sysdeps/linux/e1/longjmp.c @@ -12,7 +12,7 @@ #include #define __NR_e1newSP 224 -static inline _syscall1(int, e1newSP, unsigned long, SavedSP ) +static __inline__ _syscall1(int, e1newSP, unsigned long, SavedSP ) unsigned long jmpbuf_ptr; diff --git a/libc/sysdeps/linux/frv/mmap.c b/libc/sysdeps/linux/frv/mmap.c index d4cfcb062..f251babbb 100644 --- a/libc/sysdeps/linux/frv/mmap.c +++ b/libc/sysdeps/linux/frv/mmap.c @@ -32,7 +32,7 @@ libc_hidden_proto(mmap) #define __NR___syscall_mmap2 __NR_mmap2 -static inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, +static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, off_t, offset); /* This is always 12, even on architectures where PAGE_SHIFT != 12. */ diff --git a/libc/sysdeps/linux/mips/pread_write.c b/libc/sysdeps/linux/mips/pread_write.c index 553864531..0939e17b6 100644 --- a/libc/sysdeps/linux/mips/pread_write.c +++ b/libc/sysdeps/linux/mips/pread_write.c @@ -49,7 +49,7 @@ weak_alias (__libc_pread64, pread64) # endif /* __UCLIBC_HAS_LFS__ */ # else /* O32 || N32 */ # define __NR___syscall_pread __NR_pread -static inline _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, +static __inline__ _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) @@ -93,7 +93,7 @@ weak_alias (__libc_pwrite64, pwrite64) # endif /* __UCLIBC_HAS_LFS__ */ # else /* O32 || N32 */ # define __NR___syscall_pwrite __NR_pwrite -static inline _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, +static __inline__ _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) diff --git a/libc/sysdeps/linux/powerpc/pread_write.c b/libc/sysdeps/linux/powerpc/pread_write.c index e9f8cbef8..18940d1f9 100644 --- a/libc/sysdeps/linux/powerpc/pread_write.c +++ b/libc/sysdeps/linux/powerpc/pread_write.c @@ -21,8 +21,8 @@ #ifdef __NR_pread extern __typeof(pread) __libc_pread; -# define __NR___syscall_pread __NR_pread -static inline _syscall4(ssize_t, __syscall_pread, int, fd, +# define __NR___syscall_pread __NR_pread +static __inline__ _syscall4(ssize_t, __syscall_pread, int, fd, void *, buf, size_t, count, off64_t, offset); ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) @@ -44,8 +44,8 @@ weak_alias(__libc_pread64,pread64) #ifdef __NR_pwrite extern __typeof(pwrite) __libc_pwrite; -# define __NR___syscall_pwrite __NR_pwrite -static inline _syscall4(ssize_t, __syscall_pwrite, int, fd, +# define __NR___syscall_pwrite __NR_pwrite +static __inline__ _syscall4(ssize_t, __syscall_pwrite, int, fd, const void *, buf, size_t, count, off64_t, offset); ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) diff --git a/libc/sysdeps/linux/sh/pread_write.c b/libc/sysdeps/linux/sh/pread_write.c index e91582f2e..1fef23ae8 100644 --- a/libc/sysdeps/linux/sh/pread_write.c +++ b/libc/sysdeps/linux/sh/pread_write.c @@ -28,7 +28,7 @@ #ifdef __NR_pread extern __typeof(pread) __libc_pread; # define __NR___syscall_pread __NR_pread -static inline _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, +static __inline__ _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) @@ -61,7 +61,7 @@ weak_alias(__libc_pread64,pread64) #ifdef __NR_pwrite extern __typeof(pwrite) __libc_pwrite; # define __NR___syscall_pwrite __NR_pwrite -static inline _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, +static __inline__ _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, size_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) diff --git a/libc/sysdeps/linux/xtensa/pread_write.c b/libc/sysdeps/linux/xtensa/pread_write.c index 9e8813210..40d0f0324 100644 --- a/libc/sysdeps/linux/xtensa/pread_write.c +++ b/libc/sysdeps/linux/xtensa/pread_write.c @@ -31,7 +31,7 @@ extern __typeof(pwrite64) __libc_pwrite64; # define __NR___syscall_pread __NR_pread /* On Xtensa, 64-bit values are aligned in even/odd register pairs. */ -static inline _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, +static __inline__ _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, size_t, count, int, pad, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) @@ -56,7 +56,7 @@ weak_alias(__libc_pread64,pread64) # define __NR___syscall_pwrite __NR_pwrite /* On Xtensa, 64-bit values are aligned in even/odd register pairs. */ -static inline _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, +static __inline__ _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, size_t, count, int, pad, off_t, offset_hi, off_t, offset_lo); ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) diff --git a/libpthread/linuxthreads.old/internals.h b/libpthread/linuxthreads.old/internals.h index ab227d6cc..96edbf98f 100644 --- a/libpthread/linuxthreads.old/internals.h +++ b/libpthread/linuxthreads.old/internals.h @@ -305,14 +305,14 @@ extern volatile pthread_descr __pthread_last_event; /* Return the handle corresponding to a thread id */ -static inline pthread_handle thread_handle(pthread_t id) +static __inline__ pthread_handle thread_handle(pthread_t id) { return &__pthread_handles[id % PTHREAD_THREADS_MAX]; } /* Validate a thread handle. Must have acquired h->h_spinlock before. */ -static inline int invalid_handle(pthread_handle h, pthread_t id) +static __inline__ int invalid_handle(pthread_handle h, pthread_t id) { return h->h_descr == NULL || h->h_descr->p_tid != id; } @@ -381,8 +381,8 @@ extern size_t __pagesize; extern pthread_descr __pthread_find_self (void) __attribute__ ((const)); -static inline pthread_descr thread_self (void) __attribute__ ((const)); -static inline pthread_descr thread_self (void) +static __inline__ pthread_descr thread_self (void) __attribute__ ((const)); +static __inline__ pthread_descr thread_self (void) { #ifdef THREAD_SELF return THREAD_SELF; diff --git a/libpthread/linuxthreads.old/manager.c b/libpthread/linuxthreads.old/manager.c index fc39b1e25..2af743ba1 100644 --- a/libpthread/linuxthreads.old/manager.c +++ b/libpthread/linuxthreads.old/manager.c @@ -76,7 +76,7 @@ volatile pthread_descr __pthread_last_event; /* Stack segment numbers are also indices into the __pthread_handles array. */ /* Stack segment number 0 is reserved for the initial thread. */ -static inline pthread_descr thread_segment(int seg) +static __inline__ pthread_descr thread_segment(int seg) { return (pthread_descr)(THREAD_STACK_START_ADDRESS - (seg - 1) * STACK_SIZE) - 1; diff --git a/libpthread/linuxthreads.old/oldsemaphore.c b/libpthread/linuxthreads.old/oldsemaphore.c index 178affa1b..bb393ef5e 100644 --- a/libpthread/linuxthreads.old/oldsemaphore.c +++ b/libpthread/linuxthreads.old/oldsemaphore.c @@ -35,7 +35,7 @@ typedef struct { /* Maximum value the semaphore can have. */ #define SEM_VALUE_MAX ((int) ((~0u) >> 1)) -static inline int sem_compare_and_swap(old_sem_t *sem, long oldval, long newval) +static __inline__ int sem_compare_and_swap(old_sem_t *sem, long oldval, long newval) { return compare_and_swap(&sem->sem_status, oldval, newval, &sem->sem_spinlock); } diff --git a/libpthread/linuxthreads.old/ptfork.c b/libpthread/linuxthreads.old/ptfork.c index 184508a3d..c34ea8104 100644 --- a/libpthread/linuxthreads.old/ptfork.c +++ b/libpthread/linuxthreads.old/ptfork.c @@ -73,7 +73,7 @@ int pthread_atfork(void (*prepare)(void), } //strong_alias (__pthread_atfork, pthread_atfork) -static inline void pthread_call_handlers(struct handler_list * list) +static __inline__ void pthread_call_handlers(struct handler_list * list) { for (/*nothing*/; list != NULL; list = list->next) (list->handler)(); } diff --git a/libpthread/linuxthreads.old/queue.h b/libpthread/linuxthreads.old/queue.h index c7f8471b9..01d18d16e 100644 --- a/libpthread/linuxthreads.old/queue.h +++ b/libpthread/linuxthreads.old/queue.h @@ -18,7 +18,7 @@ linked through their p_nextwaiting field. The lists are kept sorted by decreasing priority, and then decreasing waiting time. */ -static inline void enqueue(pthread_descr * q, pthread_descr th) +static __inline__ void enqueue(pthread_descr * q, pthread_descr th) { int prio = th->p_priority; for (; *q != NULL; q = &((*q)->p_nextwaiting)) { @@ -31,7 +31,7 @@ static inline void enqueue(pthread_descr * q, pthread_descr th) *q = th; } -static inline pthread_descr dequeue(pthread_descr * q) +static __inline__ pthread_descr dequeue(pthread_descr * q) { pthread_descr th; th = *q; @@ -42,7 +42,7 @@ static inline pthread_descr dequeue(pthread_descr * q) return th; } -static inline int remove_from_queue(pthread_descr * q, pthread_descr th) +static __inline__ int remove_from_queue(pthread_descr * q, pthread_descr th) { for (; *q != NULL; q = &((*q)->p_nextwaiting)) { if (*q == th) { @@ -54,7 +54,7 @@ static inline int remove_from_queue(pthread_descr * q, pthread_descr th) return 0; } -static inline int queue_is_empty(pthread_descr * q) +static __inline__ int queue_is_empty(pthread_descr * q) { return *q == NULL; } diff --git a/libpthread/linuxthreads.old/restart.h b/libpthread/linuxthreads.old/restart.h index 687d92fae..7d63a7022 100644 --- a/libpthread/linuxthreads.old/restart.h +++ b/libpthread/linuxthreads.old/restart.h @@ -18,7 +18,7 @@ /* Primitives for controlling thread execution */ -static inline void restart(pthread_descr th) +static __inline__ void restart(pthread_descr th) { /* See pthread.c */ #if __ASSUME_REALTIME_SIGNALS @@ -28,7 +28,7 @@ static inline void restart(pthread_descr th) #endif } -static inline void suspend(pthread_descr self) +static __inline__ void suspend(pthread_descr self) { /* See pthread.c */ #if __ASSUME_REALTIME_SIGNALS @@ -38,7 +38,7 @@ static inline void suspend(pthread_descr self) #endif } -static inline int timedsuspend(pthread_descr self, +static __inline__ int timedsuspend(pthread_descr self, const struct timespec *abstime) { /* See pthread.c */ diff --git a/libpthread/linuxthreads.old/spinlock.c b/libpthread/linuxthreads.old/spinlock.c index 994596d05..cf49bc781 100644 --- a/libpthread/linuxthreads.old/spinlock.c +++ b/libpthread/linuxthreads.old/spinlock.c @@ -30,7 +30,7 @@ libpthread_hidden_proto(nanosleep) static void __pthread_acquire(int * spinlock); -static inline void __pthread_release(int * spinlock) +static __inline__ void __pthread_release(int * spinlock) { WRITE_MEMORY_BARRIER(); *spinlock = __LT_SPINLOCK_INIT; diff --git a/libpthread/linuxthreads.old/spinlock.h b/libpthread/linuxthreads.old/spinlock.h index 0ec40c57c..7117898f7 100644 --- a/libpthread/linuxthreads.old/spinlock.h +++ b/libpthread/linuxthreads.old/spinlock.h @@ -39,7 +39,7 @@ extern int __pthread_has_cas; extern int __pthread_compare_and_swap(long * ptr, long oldval, long newval, int * spinlock); -static inline int compare_and_swap(long * ptr, long oldval, long newval, +static __inline__ int compare_and_swap(long * ptr, long oldval, long newval, int * spinlock) { if (__builtin_expect (__pthread_has_cas, 1)) @@ -56,7 +56,7 @@ static inline int compare_and_swap(long * ptr, long oldval, long newval, #ifdef HAS_COMPARE_AND_SWAP_WITH_RELEASE_SEMANTICS -static inline int +static __inline__ int compare_and_swap_with_release_semantics (long * ptr, long oldval, long newval, int * spinlock) { @@ -66,7 +66,7 @@ compare_and_swap_with_release_semantics (long * ptr, long oldval, #endif -static inline int compare_and_swap(long * ptr, long oldval, long newval, +static __inline__ int compare_and_swap(long * ptr, long oldval, long newval, int * spinlock) { return __compare_and_swap(ptr, oldval, newval); @@ -77,7 +77,7 @@ static inline int compare_and_swap(long * ptr, long oldval, long newval, extern int __pthread_compare_and_swap(long * ptr, long oldval, long newval, int * spinlock); -static inline int compare_and_swap(long * ptr, long oldval, long newval, +static __inline__ int compare_and_swap(long * ptr, long oldval, long newval, int * spinlock) { return __pthread_compare_and_swap(ptr, oldval, newval, spinlock); @@ -96,13 +96,13 @@ extern void internal_function __pthread_lock(struct _pthread_fastlock * lock, pthread_descr self); extern int __pthread_unlock(struct _pthread_fastlock *lock); -static inline void __pthread_init_lock(struct _pthread_fastlock * lock) +static __inline__ void __pthread_init_lock(struct _pthread_fastlock * lock) { lock->__status = 0; lock->__spinlock = __LT_SPINLOCK_INIT; } -static inline int __pthread_trylock (struct _pthread_fastlock * lock) +static __inline__ int __pthread_trylock (struct _pthread_fastlock * lock) { #if defined TEST_FOR_COMPARE_AND_SWAP if (!__pthread_has_cas) @@ -133,13 +133,13 @@ extern int __pthread_alt_timedlock(struct _pthread_fastlock * lock, extern void __pthread_alt_unlock(struct _pthread_fastlock *lock); -static inline void __pthread_alt_init_lock(struct _pthread_fastlock * lock) +static __inline__ void __pthread_alt_init_lock(struct _pthread_fastlock * lock) { lock->__status = 0; lock->__spinlock = __LT_SPINLOCK_INIT; } -static inline int __pthread_alt_trylock (struct _pthread_fastlock * lock) +static __inline__ int __pthread_alt_trylock (struct _pthread_fastlock * lock) { #if defined TEST_FOR_COMPARE_AND_SWAP if (!__pthread_has_cas) @@ -172,7 +172,7 @@ static inline int __pthread_alt_trylock (struct _pthread_fastlock * lock) /* Operations on pthread_atomic, which is defined in internals.h */ -static inline long atomic_increment(struct pthread_atomic *pa) +static __inline__ long atomic_increment(struct pthread_atomic *pa) { long oldval; @@ -184,7 +184,7 @@ static inline long atomic_increment(struct pthread_atomic *pa) } -static inline long atomic_decrement(struct pthread_atomic *pa) +static __inline__ long atomic_decrement(struct pthread_atomic *pa) { long oldval; @@ -196,7 +196,7 @@ static inline long atomic_decrement(struct pthread_atomic *pa) } -static inline void +static __inline__ void __pthread_set_own_extricate_if (pthread_descr self, pthread_extricate_if *peif) { /* Only store a non-null peif if the thread has cancellation enabled. diff --git a/libpthread/linuxthreads.old/sysdeps/mips/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/mips/pt-machine.h index 638952846..fb1cc0e6d 100644 --- a/libpthread/linuxthreads.old/sysdeps/mips/pt-machine.h +++ b/libpthread/linuxthreads.old/sysdeps/mips/pt-machine.h @@ -33,7 +33,7 @@ /* Copyright (C) 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Maciej W. Rozycki , 2000. */ -static inline int +static __inline__ int __NTH (_test_and_set (int *p, int v)) { int r, t; diff --git a/libpthread/linuxthreads.old_db/thread_dbP.h b/libpthread/linuxthreads.old_db/thread_dbP.h index f08c43206..b120c42b3 100644 --- a/libpthread/linuxthreads.old_db/thread_dbP.h +++ b/libpthread/linuxthreads.old_db/thread_dbP.h @@ -89,7 +89,7 @@ struct agent_list extern struct agent_list *__td_agent_list attribute_hidden; /* Function used to test for correct thread agent pointer. */ -static inline int +static __inline__ int ta_ok (const td_thragent_t *ta) { struct agent_list *runp = __td_agent_list; diff --git a/libpthread/linuxthreads/descr.h b/libpthread/linuxthreads/descr.h index 0f50d4deb..24ec30b41 100644 --- a/libpthread/linuxthreads/descr.h +++ b/libpthread/linuxthreads/descr.h @@ -244,8 +244,8 @@ extern int __pthread_nonstandard_stacks; extern pthread_descr __pthread_find_self (void) __attribute__ ((pure)); -static inline pthread_descr thread_self (void) __attribute__ ((pure)); -static inline pthread_descr thread_self (void) +static __inline__ pthread_descr thread_self (void) __attribute__ ((pure)); +static __inline__ pthread_descr thread_self (void) { #ifdef THREAD_SELF return THREAD_SELF; diff --git a/libpthread/linuxthreads/internals.h b/libpthread/linuxthreads/internals.h index 8e270e37a..ecb7b03dd 100644 --- a/libpthread/linuxthreads/internals.h +++ b/libpthread/linuxthreads/internals.h @@ -174,19 +174,19 @@ extern int __pthread_smp_kernel; /* Return the handle corresponding to a thread id */ -static inline pthread_handle thread_handle(pthread_t id) +static __inline__ pthread_handle thread_handle(pthread_t id) { return &__pthread_handles[id % PTHREAD_THREADS_MAX]; } /* Validate a thread handle. Must have acquired h->h_spinlock before. */ -static inline int invalid_handle(pthread_handle h, pthread_t id) +static __inline__ int invalid_handle(pthread_handle h, pthread_t id) { return h->h_descr == NULL || h->h_descr->p_tid != id || h->h_descr->p_terminated; } -static inline int nonexisting_handle(pthread_handle h, pthread_t id) +static __inline__ int nonexisting_handle(pthread_handle h, pthread_t id) { return h->h_descr == NULL || h->h_descr->p_tid != id; } diff --git a/libpthread/linuxthreads/manager.c b/libpthread/linuxthreads/manager.c index bbdbd59a0..b0a2a3712 100644 --- a/libpthread/linuxthreads/manager.c +++ b/libpthread/linuxthreads/manager.c @@ -68,7 +68,7 @@ static pthread_descr manager_thread; #if FLOATING_STACKS # define thread_segment(seq) NULL #else -static inline pthread_descr thread_segment(int seg) +static __inline__ pthread_descr thread_segment(int seg) { # ifdef _STACK_GROWS_UP return (pthread_descr)(THREAD_STACK_START_ADDRESS + (seg - 1) * STACK_SIZE) diff --git a/libpthread/linuxthreads/ptcleanup.c b/libpthread/linuxthreads/ptcleanup.c index fa44ea142..6213b56f3 100644 --- a/libpthread/linuxthreads/ptcleanup.c +++ b/libpthread/linuxthreads/ptcleanup.c @@ -28,7 +28,7 @@ #endif #ifndef NO_PTR_DEMANGLE -static inline uintptr_t +static __inline__ uintptr_t demangle_ptr (uintptr_t x) { #ifdef PTR_DEMANGLE diff --git a/libpthread/linuxthreads/pthread.c b/libpthread/linuxthreads/pthread.c index 64aad7cc1..4c44252ab 100644 --- a/libpthread/linuxthreads/pthread.c +++ b/libpthread/linuxthreads/pthread.c @@ -468,7 +468,7 @@ __libc_dl_error_tsd (void) #endif #ifdef USE_TLS -static inline void __attribute__((always_inline)) +static __inline__ void __attribute__((always_inline)) init_one_static_tls (pthread_descr descr, struct link_map *map) { # if TLS_TCB_AT_TP diff --git a/libpthread/linuxthreads/queue.h b/libpthread/linuxthreads/queue.h index 28bd75531..e50517f77 100644 --- a/libpthread/linuxthreads/queue.h +++ b/libpthread/linuxthreads/queue.h @@ -18,7 +18,7 @@ linked through their p_nextwaiting field. The lists are kept sorted by decreasing priority, and then decreasing waiting time. */ -static inline void enqueue(pthread_descr * q, pthread_descr th) +static __inline__ void enqueue(pthread_descr * q, pthread_descr th) { int prio = th->p_priority; ASSERT(th->p_nextwaiting == NULL); @@ -32,7 +32,7 @@ static inline void enqueue(pthread_descr * q, pthread_descr th) *q = th; } -static inline pthread_descr dequeue(pthread_descr * q) +static __inline__ pthread_descr dequeue(pthread_descr * q) { pthread_descr th; th = *q; @@ -43,7 +43,7 @@ static inline pthread_descr dequeue(pthread_descr * q) return th; } -static inline int remove_from_queue(pthread_descr * q, pthread_descr th) +static __inline__ int remove_from_queue(pthread_descr * q, pthread_descr th) { for (; *q != NULL; q = &((*q)->p_nextwaiting)) { if (*q == th) { @@ -55,7 +55,7 @@ static inline int remove_from_queue(pthread_descr * q, pthread_descr th) return 0; } -static inline int queue_is_empty(pthread_descr * q) +static __inline__ int queue_is_empty(pthread_descr * q) { return *q == NULL; } diff --git a/libpthread/linuxthreads/restart.h b/libpthread/linuxthreads/restart.h index 24d9fab74..f53642eda 100644 --- a/libpthread/linuxthreads/restart.h +++ b/libpthread/linuxthreads/restart.h @@ -17,7 +17,7 @@ /* Primitives for controlling thread execution */ -static inline void restart(pthread_descr th) +static __inline__ void restart(pthread_descr th) { /* See pthread.c */ #if __ASSUME_REALTIME_SIGNALS @@ -27,7 +27,7 @@ static inline void restart(pthread_descr th) #endif } -static inline void suspend(pthread_descr self) +static __inline__ void suspend(pthread_descr self) { /* See pthread.c */ #if __ASSUME_REALTIME_SIGNALS @@ -37,7 +37,7 @@ static inline void suspend(pthread_descr self) #endif } -static inline int timedsuspend(pthread_descr self, +static __inline__ int timedsuspend(pthread_descr self, const struct timespec *abstime) { /* See pthread.c */ diff --git a/libpthread/linuxthreads/spinlock.c b/libpthread/linuxthreads/spinlock.c index 6b6610688..f32540286 100644 --- a/libpthread/linuxthreads/spinlock.c +++ b/libpthread/linuxthreads/spinlock.c @@ -26,7 +26,7 @@ static void __pthread_acquire(int * spinlock); -static inline void __pthread_release(int * spinlock) +static __inline__ void __pthread_release(int * spinlock) { WRITE_MEMORY_BARRIER(); *spinlock = __LT_SPINLOCK_INIT; diff --git a/libpthread/linuxthreads/spinlock.h b/libpthread/linuxthreads/spinlock.h index ff96fc336..210ead471 100644 --- a/libpthread/linuxthreads/spinlock.h +++ b/libpthread/linuxthreads/spinlock.h @@ -39,7 +39,7 @@ extern int __pthread_has_cas; extern int __pthread_compare_and_swap(long * ptr, long oldval, long newval, int * spinlock); -static inline int compare_and_swap(long * ptr, long oldval, long newval, +static __inline__ int compare_and_swap(long * ptr, long oldval, long newval, int * spinlock) { if (__builtin_expect (__pthread_has_cas, 1)) @@ -56,7 +56,7 @@ static inline int compare_and_swap(long * ptr, long oldval, long newval, #ifdef HAS_COMPARE_AND_SWAP_WITH_RELEASE_SEMANTICS -static inline int +static __inline__ int compare_and_swap_with_release_semantics (long * ptr, long oldval, long newval, int * spinlock) { @@ -66,7 +66,7 @@ compare_and_swap_with_release_semantics (long * ptr, long oldval, #endif -static inline int compare_and_swap(long * ptr, long oldval, long newval, +static __inline__ int compare_and_swap(long * ptr, long oldval, long newval, int * spinlock) { return __compare_and_swap(ptr, oldval, newval); @@ -77,7 +77,7 @@ static inline int compare_and_swap(long * ptr, long oldval, long newval, extern int __pthread_compare_and_swap(long * ptr, long oldval, long newval, int * spinlock); -static inline int compare_and_swap(long * ptr, long oldval, long newval, +static __inline__ int compare_and_swap(long * ptr, long oldval, long newval, int * spinlock) { return __pthread_compare_and_swap(ptr, oldval, newval, spinlock); @@ -96,13 +96,13 @@ extern void internal_function __pthread_lock(struct _pthread_fastlock * lock, pthread_descr self); extern int __pthread_unlock(struct _pthread_fastlock *lock); -static inline void __pthread_init_lock(struct _pthread_fastlock * lock) +static __inline__ void __pthread_init_lock(struct _pthread_fastlock * lock) { lock->__status = 0; lock->__spinlock = __LT_SPINLOCK_INIT; } -static inline int __pthread_trylock (struct _pthread_fastlock * lock) +static __inline__ int __pthread_trylock (struct _pthread_fastlock * lock) { #if defined TEST_FOR_COMPARE_AND_SWAP if (!__pthread_has_cas) @@ -133,13 +133,13 @@ extern int __pthread_alt_timedlock(struct _pthread_fastlock * lock, extern void __pthread_alt_unlock(struct _pthread_fastlock *lock); -static inline void __pthread_alt_init_lock(struct _pthread_fastlock * lock) +static __inline__ void __pthread_alt_init_lock(struct _pthread_fastlock * lock) { lock->__status = 0; lock->__spinlock = __LT_SPINLOCK_INIT; } -static inline int __pthread_alt_trylock (struct _pthread_fastlock * lock) +static __inline__ int __pthread_alt_trylock (struct _pthread_fastlock * lock) { #if defined TEST_FOR_COMPARE_AND_SWAP if (!__pthread_has_cas) @@ -172,7 +172,7 @@ static inline int __pthread_alt_trylock (struct _pthread_fastlock * lock) /* Operations on pthread_atomic, which is defined in internals.h */ -static inline long atomic_increment(struct pthread_atomic *pa) +static __inline__ long atomic_increment(struct pthread_atomic *pa) { long oldval; @@ -184,7 +184,7 @@ static inline long atomic_increment(struct pthread_atomic *pa) } -static inline long atomic_decrement(struct pthread_atomic *pa) +static __inline__ long atomic_decrement(struct pthread_atomic *pa) { long oldval; @@ -196,7 +196,7 @@ static inline long atomic_decrement(struct pthread_atomic *pa) } -static inline __attribute__((always_inline)) void +static __inline__ __attribute__((always_inline)) void __pthread_set_own_extricate_if (pthread_descr self, pthread_extricate_if *peif) { /* Only store a non-null peif if the thread has cancellation enabled. diff --git a/libpthread/linuxthreads/sysdeps/pthread/list.h b/libpthread/linuxthreads/sysdeps/pthread/list.h index 43186a2d5..75decfbb7 100644 --- a/libpthread/linuxthreads/sysdeps/pthread/list.h +++ b/libpthread/linuxthreads/sysdeps/pthread/list.h @@ -43,7 +43,7 @@ typedef struct list_head /* Add new element at the head of the list. */ -static inline void +static __inline__ void list_add (list_t *newp, list_t *head) { head->next->prev = newp; @@ -54,7 +54,7 @@ list_add (list_t *newp, list_t *head) /* Add new element at the tail of the list. */ -static inline void +static __inline__ void list_add_tail (list_t *newp, list_t *head) { head->prev->next = newp; @@ -65,7 +65,7 @@ list_add_tail (list_t *newp, list_t *head) /* Remove element from list. */ -static inline void +static __inline__ void list_del (list_t *elem) { elem->next->prev = elem->prev; @@ -74,7 +74,7 @@ list_del (list_t *elem) /* Join two lists. */ -static inline void +static __inline__ void list_splice (list_t *add, list_t *head) { /* Do nothing if the list which gets added is empty. */ diff --git a/libpthread/linuxthreads/sysdeps/pthread/posix-timer.h b/libpthread/linuxthreads/sysdeps/pthread/posix-timer.h index 1b0a2b65e..5486f7d6a 100644 --- a/libpthread/linuxthreads/sysdeps/pthread/posix-timer.h +++ b/libpthread/linuxthreads/sysdeps/pthread/posix-timer.h @@ -88,7 +88,7 @@ extern struct thread_node __timer_signal_thread_rclk; /* Return pointer to timer structure corresponding to ID. */ -static inline struct timer_node * +static __inline__ struct timer_node * timer_id2ptr (timer_t timerid) { if (timerid >= 0 && timerid < TIMER_MAX) @@ -98,14 +98,14 @@ timer_id2ptr (timer_t timerid) } /* Return ID of TIMER. */ -static inline int +static __inline__ int timer_ptr2id (struct timer_node *timer) { return timer - __timer_array; } /* Check whether timer is valid; global mutex must be held. */ -static inline int +static __inline__ int timer_valid (struct timer_node *timer) { return timer && timer->inuse == TIMER_INUSE; @@ -114,13 +114,13 @@ timer_valid (struct timer_node *timer) /* Timer refcount functions; need global mutex. */ extern void __timer_dealloc (struct timer_node *timer); -static inline void +static __inline__ void timer_addref (struct timer_node *timer) { timer->refcount++; } -static inline void +static __inline__ void timer_delref (struct timer_node *timer) { if (--timer->refcount == 0) @@ -128,7 +128,7 @@ timer_delref (struct timer_node *timer) } /* Timespec helper routines. */ -static inline int +static __inline__ int timespec_compare (const struct timespec *left, const struct timespec *right) { if (left->tv_sec < right->tv_sec) @@ -144,7 +144,7 @@ timespec_compare (const struct timespec *left, const struct timespec *right) return 0; } -static inline void +static __inline__ void timespec_add (struct timespec *sum, const struct timespec *left, const struct timespec *right) { @@ -158,7 +158,7 @@ timespec_add (struct timespec *sum, const struct timespec *left, } } -static inline void +static __inline__ void timespec_sub (struct timespec *diff, const struct timespec *left, const struct timespec *right) { @@ -174,7 +174,7 @@ timespec_sub (struct timespec *diff, const struct timespec *left, /* We need one of the list functions in the other modules. */ -static inline void +static __inline__ void list_unlink_ip (struct list_links *list) { struct list_links *lnext = list->next, *lprev = list->prev; diff --git a/libpthread/linuxthreads/sysdeps/pthread/timer_routines.c b/libpthread/linuxthreads/sysdeps/pthread/timer_routines.c index 3877b86fb..25b4630ee 100644 --- a/libpthread/linuxthreads/sysdeps/pthread/timer_routines.c +++ b/libpthread/linuxthreads/sysdeps/pthread/timer_routines.c @@ -65,13 +65,13 @@ extern int __syscall_rt_sigqueueinfo (int, int, siginfo_t *); /* List handling functions. */ -static inline void +static __inline__ void list_init (struct list_links *list) { list->next = list->prev = list; } -static inline void +static __inline__ void list_append (struct list_links *list, struct list_links *newp) { newp->prev = list->prev; @@ -80,7 +80,7 @@ list_append (struct list_links *list, struct list_links *newp) list->prev = newp; } -static inline void +static __inline__ void list_insbefore (struct list_links *list, struct list_links *newp) { list_append (list, newp); @@ -91,7 +91,7 @@ list_insbefore (struct list_links *list, struct list_links *newp) * is already unlinked is disastrous rather than a noop. */ -static inline void +static __inline__ void list_unlink (struct list_links *list) { struct list_links *lnext = list->next, *lprev = list->prev; @@ -100,25 +100,25 @@ list_unlink (struct list_links *list) lprev->next = lnext; } -static inline struct list_links * +static __inline__ struct list_links * list_first (struct list_links *list) { return list->next; } -static inline struct list_links * +static __inline__ struct list_links * list_null (struct list_links *list) { return list; } -static inline struct list_links * +static __inline__ struct list_links * list_next (struct list_links *list) { return list->next; } -static inline int +static __inline__ int list_isempty (struct list_links *list) { return list->next == list; @@ -126,14 +126,14 @@ list_isempty (struct list_links *list) /* Functions build on top of the list functions. */ -static inline struct thread_node * +static __inline__ struct thread_node * thread_links2ptr (struct list_links *list) { return (struct thread_node *) ((char *) list - offsetof (struct thread_node, links)); } -static inline struct timer_node * +static __inline__ struct timer_node * timer_links2ptr (struct list_links *list) { return (struct timer_node *) ((char *) list diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/smp.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/smp.h index 2c0cbe99a..5e2f43cda 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/smp.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/smp.h @@ -17,7 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -static inline int +static __inline__ int is_smp_system (void) { return 0; diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c index fdec09455..3432125bb 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sigwait.c @@ -31,7 +31,7 @@ extern int __syscall_rt_sigtimedwait (const sigset_t *__unbounded, siginfo_t *__ /* Return any pending signal or wait for one for the given time. */ -static inline int +static __inline__ int do_sigwait (const sigset_t *set, int *sig) { int ret; diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/smp.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/smp.h index 81289294b..9ab75e8e6 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/smp.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/smp.h @@ -22,7 +22,7 @@ /* Test whether the machine has more than one processor. This is not the best test but good enough. More complicated tests would require `malloc' which is not available at that time. */ -static inline int +static __inline__ int is_smp_system (void) { static const int sysctl_args[] = { CTL_KERN, KERN_VERSION }; diff --git a/libpthread/linuxthreads_db/thread_dbP.h b/libpthread/linuxthreads_db/thread_dbP.h index 30bdae451..407f30634 100644 --- a/libpthread/linuxthreads_db/thread_dbP.h +++ b/libpthread/linuxthreads_db/thread_dbP.h @@ -87,7 +87,7 @@ struct agent_list extern struct agent_list *__td_agent_list attribute_hidden; /* Function used to test for correct thread agent pointer. */ -static inline int +static __inline__ int ta_ok (const td_thragent_t *ta) { struct agent_list *runp = __td_agent_list; diff --git a/librt/mq_getsetattr.c b/librt/mq_getsetattr.c index 17c93a0b1..b50d9a974 100644 --- a/librt/mq_getsetattr.c +++ b/librt/mq_getsetattr.c @@ -12,7 +12,7 @@ librt_hidden_proto(mq_setattr) #define __NR___syscall_mq_getsetattr __NR_mq_getsetattr -static inline _syscall3(int, __syscall_mq_getsetattr, int, mqdes, +static __inline__ _syscall3(int, __syscall_mq_getsetattr, int, mqdes, const void *, mqstat, void *, omqstat); /* diff --git a/librt/mq_notify.c b/librt/mq_notify.c index 3d58e1161..2556669b7 100644 --- a/librt/mq_notify.c +++ b/librt/mq_notify.c @@ -11,7 +11,7 @@ #ifdef __NR_mq_notify #define __NR___syscall_mq_notify __NR_mq_notify -static inline _syscall2(int, __syscall_mq_notify, int, mqdes, +static __inline__ _syscall2(int, __syscall_mq_notify, int, mqdes, const void *, notification); /* Register notification upon message arrival to an empty message queue */ diff --git a/librt/mq_open.c b/librt/mq_open.c index e87220eb0..62c831032 100644 --- a/librt/mq_open.c +++ b/librt/mq_open.c @@ -12,7 +12,7 @@ #ifdef __NR_mq_open #define __NR___syscall_mq_open __NR_mq_open -static inline _syscall4(int, __syscall_mq_open, const char *, name, +static __inline__ _syscall4(int, __syscall_mq_open, const char *, name, int, oflag, __kernel_mode_t, mode, void *, attr); /* * Establish connection between a process and a message queue and diff --git a/librt/mq_receive.c b/librt/mq_receive.c index 276b1f573..3da88f391 100644 --- a/librt/mq_receive.c +++ b/librt/mq_receive.c @@ -11,7 +11,7 @@ librt_hidden_proto(mq_timedreceive) #ifdef __NR_mq_timedreceive #define __NR___syscall_mq_timedreceive __NR_mq_timedreceive -static inline _syscall5(int, __syscall_mq_timedreceive, int, mqdes, +static __inline__ _syscall5(int, __syscall_mq_timedreceive, int, mqdes, char *, msg_ptr, size_t, msg_len, unsigned int *, msg_prio, const void *, abs_timeout); #endif diff --git a/librt/mq_send.c b/librt/mq_send.c index fbfc99e46..446ecc89a 100644 --- a/librt/mq_send.c +++ b/librt/mq_send.c @@ -11,7 +11,7 @@ librt_hidden_proto(mq_timedsend) #ifdef __NR_mq_timedsend #define __NR___syscall_mq_timedsend __NR_mq_timedsend -static inline _syscall5(int, __syscall_mq_timedsend, int, mqdes, +static __inline__ _syscall5(int, __syscall_mq_timedsend, int, mqdes, const char *, msg_ptr, size_t, msg_len, unsigned int, msg_prio, const void *, abs_timeout); #endif diff --git a/librt/mq_unlink.c b/librt/mq_unlink.c index 8e89610a3..3c490e0ce 100644 --- a/librt/mq_unlink.c +++ b/librt/mq_unlink.c @@ -10,7 +10,7 @@ #ifdef __NR_mq_unlink #define __NR___syscall_mq_unlink __NR_mq_unlink -static inline _syscall1(int, __syscall_mq_unlink, const char *, name); +static __inline__ _syscall1(int, __syscall_mq_unlink, const char *, name); /* Remove message queue */ int mq_unlink(const char *name) diff --git a/librt/timer_create.c b/librt/timer_create.c index 6aca5fffb..9298a37c7 100644 --- a/librt/timer_create.c +++ b/librt/timer_create.c @@ -18,7 +18,7 @@ #endif #define __NR___syscall_timer_create __NR_timer_create -static inline _syscall3(int, __syscall_timer_create, clockid_t, clock_id, +static __inline__ _syscall3(int, __syscall_timer_create, clockid_t, clock_id, struct sigevent *, evp, kernel_timer_t *, ktimerid); /* Create a per-process timer */ diff --git a/librt/timer_delete.c b/librt/timer_delete.c index cc749df6b..af6b34f5d 100644 --- a/librt/timer_delete.c +++ b/librt/timer_delete.c @@ -12,7 +12,7 @@ #ifdef __NR_timer_delete #define __NR___syscall_timer_delete __NR_timer_delete -static inline _syscall1(int, __syscall_timer_delete, kernel_timer_t, ktimerid); +static __inline__ _syscall1(int, __syscall_timer_delete, kernel_timer_t, ktimerid); /* Delete a per-process timer */ int timer_delete(timer_t timerid) diff --git a/librt/timer_getoverr.c b/librt/timer_getoverr.c index 71006eecd..0e8551684 100644 --- a/librt/timer_getoverr.c +++ b/librt/timer_getoverr.c @@ -11,7 +11,7 @@ #ifdef __NR_timer_getoverrun #define __NR___syscall_timer_getoverrun __NR_timer_getoverrun -static inline _syscall1(int, __syscall_timer_getoverrun, kernel_timer_t, +static __inline__ _syscall1(int, __syscall_timer_getoverrun, kernel_timer_t, ktimerid); /* Get the timer overrun count */ diff --git a/librt/timer_gettime.c b/librt/timer_gettime.c index e8d6d2676..e13f44642 100644 --- a/librt/timer_gettime.c +++ b/librt/timer_gettime.c @@ -12,7 +12,7 @@ #ifdef __NR_timer_gettime #define __NR___syscall_timer_gettime __NR_timer_gettime -static inline _syscall2(int, __syscall_timer_gettime, kernel_timer_t, ktimerid, +static __inline__ _syscall2(int, __syscall_timer_gettime, kernel_timer_t, ktimerid, void *, value); /* Get the amount of time left on a timer */ diff --git a/librt/timer_settime.c b/librt/timer_settime.c index 05c4d1aef..2703fa913 100644 --- a/librt/timer_settime.c +++ b/librt/timer_settime.c @@ -12,7 +12,7 @@ #ifdef __NR_timer_settime #define __NR___syscall_timer_settime __NR_timer_settime -static inline _syscall4(int, __syscall_timer_settime, kernel_timer_t, ktimerid, +static __inline__ _syscall4(int, __syscall_timer_settime, kernel_timer_t, ktimerid, int, flags, const void *, value, void *, ovalue); /* Set the expiration time for a timer */ diff --git a/utils/bswap.h b/utils/bswap.h index 183fce5c2..666b80a73 100644 --- a/utils/bswap.h +++ b/utils/bswap.h @@ -44,12 +44,12 @@ # include #else -static inline uint16_t bswap_16(uint16_t x) +static __inline__ uint16_t bswap_16(uint16_t x) { return ((((x) & 0xff00) >> 8) | \ (((x) & 0x00ff) << 8)); } -static inline uint32_t bswap_32(uint32_t x) +static __inline__ uint32_t bswap_32(uint32_t x) { return ((((x) & 0xff000000) >> 24) | \ (((x) & 0x00ff0000) >> 8) | \ diff --git a/utils/ldd.c b/utils/ldd.c index a00bc3ba4..4a05d32d9 100644 --- a/utils/ldd.c +++ b/utils/ldd.c @@ -158,7 +158,7 @@ char *interp_dir = NULL; static int byteswap; static int interpreter_already_found = 0; -static inline uint32_t byteswap32_to_host(uint32_t value) +static __inline__ uint32_t byteswap32_to_host(uint32_t value) { if (byteswap == 1) { return (bswap_32(value)); @@ -166,7 +166,7 @@ static inline uint32_t byteswap32_to_host(uint32_t value) return (value); } } -static inline uint64_t byteswap64_to_host(uint64_t value) +static __inline__ uint64_t byteswap64_to_host(uint64_t value) { if (byteswap == 1) { return (bswap_64(value)); @@ -348,10 +348,10 @@ int unmap_cache(void) return 0; } #else -static inline void map_cache(void) +static __inline__ void map_cache(void) { } -static inline void unmap_cache(void) +static __inline__ void unmap_cache(void) { } #endif diff --git a/utils/readelf.c b/utils/readelf.c index 188f92f9f..2af4b5ca9 100644 --- a/utils/readelf.c +++ b/utils/readelf.c @@ -28,7 +28,7 @@ /* makefile will include elf.h for us */ static int byteswap; -static inline uint32_t byteswap32_to_host(uint32_t value) +static __inline__ uint32_t byteswap32_to_host(uint32_t value) { if (byteswap==1) { return(bswap_32(value)); @@ -36,7 +36,7 @@ static inline uint32_t byteswap32_to_host(uint32_t value) return(value); } } -static inline uint64_t byteswap64_to_host(uint64_t value) +static __inline__ uint64_t byteswap64_to_host(uint64_t value) { if (byteswap==1) { return(bswap_64(value)); -- cgit v1.2.3