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; #