- fix inline keyword

78 files changed, 98 insertions, 98 deletions

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 <sys/stat.h>
 
 #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 <sys/file.h>
 
 #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 <unistd.h>
 
 #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 <unistd.h>
 #include <sys/klog.h>
 #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 <sys/syscall.h>
 #include <sys/reboot.h>
 #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 <stdio.h>
 
 #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 <sys/syscall.h>
 
 #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 <sys/syscall.h>
 
 #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 <sys/syscall.h>
 
 #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 <sys/syscall.h>
 
 #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 <sys/syscall.h>
 
 #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 <sys/stat.h>
 # 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 <sys/stat.h>
 
 #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 <sys/sysmacros.h>
 
 #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 <signal.h>
 
 #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)