9 files changed, 15 insertions, 15 deletions
diff --git a/libc/sysdeps/linux/common/bits/fenv.h b/libc/sysdeps/linux/common/bits/fenv.h
index 1b51b68ca..0248ae110 100644
--- a/libc/sysdeps/linux/common/bits/fenv.h
+++ b/libc/sysdeps/linux/common/bits/fenv.h
@@ -52,4 +52,4 @@ typedef struct
 fenv_t;
 
 /* If the default argument is used we use this value.  */
-#define FE_DFL_ENV	((__const fenv_t *) -1l)
+#define FE_DFL_ENV	((const fenv_t *) -1l)
diff --git a/libc/sysdeps/linux/common/bits/mathcalls.h b/libc/sysdeps/linux/common/bits/mathcalls.h
index 825e4234d..84b793c96 100644
--- a/libc/sysdeps/linux/common/bits/mathcalls.h
+++ b/libc/sysdeps/linux/common/bits/mathcalls.h
@@ -235,7 +235,7 @@ __END_NAMESPACE_C99
 #ifdef __USE_ISOC99
 __BEGIN_NAMESPACE_C99
 /* Return representation of NaN for double type.  */
-__MATHCALLX (nan,, (__const char *__tagb), (__const__))
+__MATHCALLX (nan,, (const char *__tagb), (__const__))
 __END_NAMESPACE_C99
 #endif
 
diff --git a/libc/sysdeps/linux/common/bits/sigset.h b/libc/sysdeps/linux/common/bits/sigset.h
index e497c26cd..beb859820 100644
--- a/libc/sysdeps/linux/common/bits/sigset.h
+++ b/libc/sysdeps/linux/common/bits/sigset.h
@@ -152,7 +152,7 @@ typedef struct {
    checking is done in the non __ versions.  */
 
 # if !defined __USE_EXTERN_INLINES || defined __PROVIDE_OUT_OF_LINE_SIGSETFN
-extern int __sigismember (__const __sigset_t *, int);
+extern int __sigismember (const __sigset_t *, int);
 libc_hidden_proto(__sigismember)
 extern int __sigaddset (__sigset_t *, int);
 libc_hidden_proto(__sigaddset)
@@ -178,7 +178,7 @@ NAME (CONST __sigset_t *__set, int __sig)				\
 	return BODY;							\
 }
 
-__SIGSETFN (__sigismember, (__set->__val[__word] & __mask) ? 1 : 0, __const)
+__SIGSETFN (__sigismember, (__set->__val[__word] & __mask) ? 1 : 0, const)
 __SIGSETFN (__sigaddset, ((__set->__val[__word] |= __mask), 0), )
 __SIGSETFN (__sigdelset, ((__set->__val[__word] &= ~__mask), 0), )
 
diff --git a/libc/sysdeps/linux/common/bits/sigthread.h b/libc/sysdeps/linux/common/bits/sigthread.h
index d739a55de..643618aa4 100644
--- a/libc/sysdeps/linux/common/bits/sigthread.h
+++ b/libc/sysdeps/linux/common/bits/sigthread.h
@@ -28,7 +28,7 @@
 /* Modify the signal mask for the calling thread.  The arguments have
    the same meaning as for sigprocmask(2). */
 extern int pthread_sigmask (int __how,
-			    __const __sigset_t *__restrict __newmask,
+			    const __sigset_t *__restrict __newmask,
 			    __sigset_t *__restrict __oldmask)__THROW;
 
 /* Send signal SIGNO to the given thread. */
diff --git a/libc/sysdeps/linux/common/bits/uClibc_pthread.h b/libc/sysdeps/linux/common/bits/uClibc_pthread.h
index 79106bf6a..708d0fed2 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_pthread.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_pthread.h
@@ -31,7 +31,7 @@ struct _pthread_cleanup_buffer;
 /* Threading functions internal to uClibc.  Make these thread functions
  * weak so that we can elide them from single-threaded processes.  */
 extern int weak_function __pthread_mutex_init (pthread_mutex_t *__mutex,
-		__const pthread_mutexattr_t *__mutex_attr);
+		const pthread_mutexattr_t *__mutex_attr);
 extern int weak_function __pthread_mutex_lock (pthread_mutex_t *__mutex);
 extern int weak_function __pthread_mutex_unlock (pthread_mutex_t *__mutex);
 extern int weak_function __pthread_mutex_trylock (pthread_mutex_t *__mutex);
diff --git a/libc/sysdeps/linux/common/bits/uClibc_stdio.h b/libc/sysdeps/linux/common/bits/uClibc_stdio.h
index 7d1df6ce9..5b3a1b310 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_stdio.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_stdio.h
@@ -175,7 +175,7 @@ typedef __off_t __offmax_t;		/* TODO -- rename this? */
 
 typedef __ssize_t __io_read_fn(void *__cookie, char *__buf, size_t __bufsize);
 typedef __ssize_t __io_write_fn(void *__cookie,
-					__const char *__buf, size_t __bufsize);
+					const char *__buf, size_t __bufsize);
 /* NOTE: GLIBC difference!!! -- fopencookie seek function
  * For glibc, the type of pos is always (__off64_t *) but in our case
  * it is type (__off_t *) when the lib is built without large file support.
diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c
index a7781a12b..29b4600d1 100644
--- a/libc/sysdeps/linux/common/epoll.c
+++ b/libc/sysdeps/linux/common/epoll.c
@@ -37,14 +37,14 @@ CANCELLABLE_SYSCALL(int, epoll_wait, (int epfd, struct epoll_event *events, int
 
 # define __NR___syscall_epoll_pwait __NR_epoll_pwait
 static __always_inline _syscall6(int, __syscall_epoll_pwait, int, epfd, struct epoll_event *, events,
-				 int, maxevents, int, timeout, __const sigset_t *, sigmask, size_t, sigsetsize)
+				 int, maxevents, int, timeout, const sigset_t *, sigmask, size_t, sigsetsize)
 
 static int __NC(epoll_pwait)(int epfd, struct epoll_event *events, int maxevents, int timeout,
-			     __const sigset_t *set)
+			     const sigset_t *set)
 {
 	return __syscall_epoll_pwait(epfd, events, maxevents, timeout, set, __SYSCALL_SIGSET_T_SIZE);
 }
 CANCELLABLE_SYSCALL(int, epoll_pwait, (int epfd, struct epoll_event *events, int maxevents, int timeout,
-				       __const sigset_t *set),
+				       const sigset_t *set),
 		    (epfd, events, maxevents, timeout, set))
 #endif
diff --git a/libc/sysdeps/linux/common/futimens.c b/libc/sysdeps/linux/common/futimens.c
index 0eaf26a4c..b825cf7ac 100644
--- a/libc/sysdeps/linux/common/futimens.c
+++ b/libc/sysdeps/linux/common/futimens.c
@@ -16,13 +16,13 @@
  * Note that due to not including the header, we have to alias the call
  * manually.
  */
-extern int utimensat (int __fd, __const char *__path,
-	__const struct timespec __times[2],
+extern int utimensat (int __fd, const char *__path,
+	const struct timespec __times[2],
 	int __flags) __THROW;
 libc_hidden_proto(utimensat)
 
-int futimens (int __fd, __const struct timespec __times[2]) __THROW;
-int futimens (int fd, __const struct timespec ts[2])
+int futimens (int __fd, const struct timespec __times[2]) __THROW;
+int futimens (int fd, const struct timespec ts[2])
 {
 	return utimensat(fd, 0, ts, 0);
 }
diff --git a/libc/sysdeps/linux/common/sys/acct.h b/libc/sysdeps/linux/common/sys/acct.h
index a487ef0bd..a816786fc 100644
--- a/libc/sysdeps/linux/common/sys/acct.h
+++ b/libc/sysdeps/linux/common/sys/acct.h
@@ -102,7 +102,7 @@ enum
 
 
 /* Switch process accounting on and off.  */
-extern int acct (__const char *__filename) __THROW;
+extern int acct (const char *__filename) __THROW;
 
 __END_DECLS