From cb97aadebfeba7f5e8f1b85beee5ab10e88c2990 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Thu, 20 Nov 2008 22:11:44 +0000
Subject: Last portion of libc_hidden_proto removal. Appears to build fine
 (several .configs tried)

---
 include/sys/mman.h     |  2 ++
 include/sys/poll.h     |  1 +
 include/sys/resource.h |  4 ++++
 include/sys/select.h   |  1 +
 include/sys/socket.h   | 12 ++++++++++++
 include/sys/stat.h     |  6 ++++++
 include/sys/statfs.h   |  2 ++
 include/sys/statvfs.h  |  2 ++
 include/sys/syslog.h   |  4 ++++
 include/sys/time.h     |  3 +++
 include/sys/times.h    |  1 +
 include/sys/timex.h    |  1 +
 include/sys/utsname.h  |  1 +
 include/sys/wait.h     |  2 ++
 14 files changed, 42 insertions(+)

(limited to 'include/sys')

diff --git a/include/sys/mman.h b/include/sys/mman.h
index d8e2c7a93..609f78a73 100644
--- a/include/sys/mman.h
+++ b/include/sys/mman.h
@@ -76,6 +76,7 @@ extern void *mmap64 (void *__addr, size_t __len, int __prot,
 /* Deallocate any mapping for the region starting at ADDR and extending LEN
    bytes.  Returns 0 if successful, -1 for errors (and sets errno).  */
 extern int munmap (void *__addr, size_t __len) __THROW;
+libc_hidden_proto(munmap)
 
 /* Change the memory protection of the region starting at ADDR and
    extending LEN bytes to PROT.  Returns 0 if successful, -1 for errors
@@ -157,6 +158,7 @@ extern int mincore (void *__start, size_t __len, unsigned char *__vec)
    resides after a successful call.  */
 extern void *mremap (void *__addr, size_t __old_len, size_t __new_len,
 		     int __flags, ...) __THROW;
+libc_hidden_proto(mremap)
 
 #ifdef __UCLIBC_LINUX_SPECIFIC__
 /* Remap arbitrary pages of a shared backing store within an existing
diff --git a/include/sys/poll.h b/include/sys/poll.h
index c786a778a..13b913494 100644
--- a/include/sys/poll.h
+++ b/include/sys/poll.h
@@ -70,6 +70,7 @@ libc_hidden_proto(poll)
 extern int ppoll (struct pollfd *__fds, nfds_t __nfds,
 		  __const struct timespec *__timeout,
 		  __const __sigset_t *__ss);
+libc_hidden_proto(ppoll)
 #endif
 
 __END_DECLS
diff --git a/include/sys/resource.h b/include/sys/resource.h
index 391274137..c7b8e0e47 100644
--- a/include/sys/resource.h
+++ b/include/sys/resource.h
@@ -50,6 +50,7 @@ typedef int __priority_which_t;
 #ifndef __USE_FILE_OFFSET64
 extern int getrlimit (__rlimit_resource_t __resource,
 		      struct rlimit *__rlimits) __THROW;
+libc_hidden_proto(getrlimit)
 #else
 # ifdef __REDIRECT_NTH
 extern int __REDIRECT_NTH (getrlimit, (__rlimit_resource_t __resource,
@@ -69,6 +70,7 @@ extern int getrlimit64 (__rlimit_resource_t __resource,
 #ifndef __USE_FILE_OFFSET64
 extern int setrlimit (__rlimit_resource_t __resource,
 		      __const struct rlimit *__rlimits) __THROW;
+libc_hidden_proto(setrlimit)
 #else
 # ifdef __REDIRECT_NTH
 extern int __REDIRECT_NTH (setrlimit, (__rlimit_resource_t __resource,
@@ -92,11 +94,13 @@ extern int getrusage (__rusage_who_t __who, struct rusage *__usage) __THROW;
    (as specified by WHO) is used.  A lower priority number means higher
    priority.  Priorities range from PRIO_MIN to PRIO_MAX (above).  */
 extern int getpriority (__priority_which_t __which, id_t __who) __THROW;
+libc_hidden_proto(getpriority)
 
 /* Set the priority of all processes specified by WHICH and WHO (see above)
    to PRIO.  Returns 0 on success, -1 on errors.  */
 extern int setpriority (__priority_which_t __which, id_t __who, int __prio)
      __THROW;
+libc_hidden_proto(setpriority)
 
 __END_DECLS
 
diff --git a/include/sys/select.h b/include/sys/select.h
index 2a408433e..6ffe4e221 100644
--- a/include/sys/select.h
+++ b/include/sys/select.h
@@ -110,6 +110,7 @@ extern int select (int __nfds, fd_set *__restrict __readfds,
 		   fd_set *__restrict __writefds,
 		   fd_set *__restrict __exceptfds,
 		   struct timeval *__restrict __timeout);
+libc_hidden_proto(select)
 
 #ifdef __USE_XOPEN2K
 /* Same as above only that the TIMEOUT value is given with higher
diff --git a/include/sys/socket.h b/include/sys/socket.h
index 5b1298f4c..fb5135d3d 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -110,10 +110,12 @@ extern int socketpair (int __domain, int __type, int __protocol,
 /* Give the socket FD the local address ADDR (which is LEN bytes long).  */
 extern int bind (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len)
      __THROW;
+libc_hidden_proto(bind)
 
 /* Put the local address of FD into *ADDR and its length in *LEN.  */
 extern int getsockname (int __fd, __SOCKADDR_ARG __addr,
 			socklen_t *__restrict __len) __THROW;
+libc_hidden_proto(getsockname)
 
 /* Open a connection on socket FD to peer at ADDR (which LEN bytes long).
    For connectionless socket types, just set the default address to send to
@@ -123,6 +125,7 @@ extern int getsockname (int __fd, __SOCKADDR_ARG __addr,
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 extern int connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len);
+libc_hidden_proto(connect)
 
 /* Put the address of the peer connected to socket FD into *ADDR
    (which is *LEN bytes long), and its actual length into *LEN.  */
@@ -135,6 +138,7 @@ extern int getpeername (int __fd, __SOCKADDR_ARG __addr,
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 extern ssize_t send (int __fd, __const void *__buf, size_t __n, int __flags);
+libc_hidden_proto(send)
 
 /* Read N bytes into BUF from socket FD.
    Returns the number read or -1 for errors.
@@ -142,6 +146,7 @@ extern ssize_t send (int __fd, __const void *__buf, size_t __n, int __flags);
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 extern ssize_t recv (int __fd, void *__buf, size_t __n, int __flags);
+libc_hidden_proto(recv)
 
 /* Send N bytes of BUF on socket FD to peer at address ADDR (which is
    ADDR_LEN bytes long).  Returns the number sent, or -1 for errors.
@@ -151,6 +156,7 @@ extern ssize_t recv (int __fd, void *__buf, size_t __n, int __flags);
 extern ssize_t sendto (int __fd, __const void *__buf, size_t __n,
 		       int __flags, __CONST_SOCKADDR_ARG __addr,
 		       socklen_t __addr_len);
+libc_hidden_proto(sendto)
 
 /* Read N bytes into BUF through socket FD.
    If ADDR is not NULL, fill in *ADDR_LEN bytes of it with tha address of
@@ -162,6 +168,7 @@ extern ssize_t sendto (int __fd, __const void *__buf, size_t __n,
 extern ssize_t recvfrom (int __fd, void *__restrict __buf, size_t __n,
 			 int __flags, __SOCKADDR_ARG __addr,
 			 socklen_t *__restrict __addr_len);
+libc_hidden_proto(recvfrom)
 
 
 /* Send a message described MESSAGE on socket FD.
@@ -171,6 +178,7 @@ extern ssize_t recvfrom (int __fd, void *__restrict __buf, size_t __n,
    __THROW.  */
 extern ssize_t sendmsg (int __fd, __const struct msghdr *__message,
 			int __flags);
+libc_hidden_proto(sendmsg)
 
 /* Receive a message as described by MESSAGE from socket FD.
    Returns the number of bytes read or -1 for errors.
@@ -178,6 +186,7 @@ extern ssize_t sendmsg (int __fd, __const struct msghdr *__message,
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 extern ssize_t recvmsg (int __fd, struct msghdr *__message, int __flags);
+libc_hidden_proto(recvmsg)
 
 
 /* Put the current value for socket FD's option OPTNAME at protocol level LEVEL
@@ -192,12 +201,14 @@ extern int getsockopt (int __fd, int __level, int __optname,
    Returns 0 on success, -1 for errors.  */
 extern int setsockopt (int __fd, int __level, int __optname,
 		       __const void *__optval, socklen_t __optlen) __THROW;
+libc_hidden_proto(setsockopt)
 
 
 /* Prepare to accept connections on socket FD.
    N connection requests will be queued before further requests are refused.
    Returns 0 on success, -1 for errors.  */
 extern int listen (int __fd, int __n) __THROW;
+libc_hidden_proto(listen)
 
 /* Await a connection on socket FD.
    When a connection arrives, open a new socket to communicate with it,
@@ -209,6 +220,7 @@ extern int listen (int __fd, int __n) __THROW;
    __THROW.  */
 extern int accept (int __fd, __SOCKADDR_ARG __addr,
 		   socklen_t *__restrict __addr_len);
+libc_hidden_proto(accept)
 
 /* Shut down all or part of the connection open on socket FD.
    HOW determines what to shut down:
diff --git a/include/sys/stat.h b/include/sys/stat.h
index 20d0f4bad..b2c87ddd5 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -228,6 +228,8 @@ extern int __REDIRECT_NTH (fstat, (int __fd, struct stat *__buf), fstat64)
 extern int stat64 (__const char *__restrict __file,
 		   struct stat64 *__restrict __buf) __THROW __nonnull ((1, 2));
 extern int fstat64 (int __fd, struct stat64 *__buf) __THROW __nonnull ((2));
+libc_hidden_proto(stat64)
+libc_hidden_proto(fstat64)
 #endif
 
 #ifdef __USE_ATFILE
@@ -275,6 +277,7 @@ extern int __REDIRECT_NTH (lstat,
 extern int lstat64 (__const char *__restrict __file,
 		    struct stat64 *__restrict __buf)
      __THROW __nonnull ((1, 2));
+libc_hidden_proto(lstat64)
 # endif
 #endif
 
@@ -282,6 +285,7 @@ extern int lstat64 (__const char *__restrict __file,
    If FILE is a symbolic link, this affects its target instead.  */
 extern int chmod (__const char *__file, __mode_t __mode)
      __THROW __nonnull ((1));
+libc_hidden_proto(chmod)
 
 #if 0 /*def __USE_BSD*/
 /* Set file access permissions for FILE to MODE.
@@ -318,6 +322,7 @@ extern __mode_t getumask (void) __THROW;
 /* Create a new directory named PATH, with permission bits MODE.  */
 extern int mkdir (__const char *__path, __mode_t __mode)
      __THROW __nonnull ((1));
+libc_hidden_proto(mkdir)
 
 #ifdef __USE_ATFILE
 /* Like mkdir, create a new directory with permission bits MODE.  But
@@ -333,6 +338,7 @@ extern int mkdirat (int __fd, __const char *__path, __mode_t __mode)
 #if defined __USE_MISC || defined __USE_BSD || defined __USE_XOPEN_EXTENDED
 extern int mknod (__const char *__path, __mode_t __mode, __dev_t __dev)
      __THROW __nonnull ((1));
+libc_hidden_proto(mknod)
 #endif
 
 #ifdef __USE_ATFILE
diff --git a/include/sys/statfs.h b/include/sys/statfs.h
index f4177d4c9..504be0308 100644
--- a/include/sys/statfs.h
+++ b/include/sys/statfs.h
@@ -43,6 +43,7 @@ extern int __REDIRECT_NTH (statfs,
 #ifdef __USE_LARGEFILE64
 extern int statfs64 (__const char *__file, struct statfs64 *__buf)
      __THROW __nonnull ((1, 2));
+libc_hidden_proto(statfs64)
 #endif
 
 #if defined __UCLIBC_LINUX_SPECIFIC__
@@ -62,6 +63,7 @@ extern int __REDIRECT_NTH (fstatfs, (int __fildes, struct statfs *__buf),
 #ifdef __USE_LARGEFILE64
 extern int fstatfs64 (int __fildes, struct statfs64 *__buf)
      __THROW __nonnull ((2));
+libc_hidden_proto(fstatfs64)
 #endif
 #endif /* __UCLIBC_LINUX_SPECIFIC__ */
 
diff --git a/include/sys/statvfs.h b/include/sys/statvfs.h
index 685dd2619..e755bafc1 100644
--- a/include/sys/statvfs.h
+++ b/include/sys/statvfs.h
@@ -52,6 +52,7 @@ __BEGIN_DECLS
 extern int statvfs (__const char *__restrict __file,
 		    struct statvfs *__restrict __buf)
      __THROW __nonnull ((1, 2));
+libc_hidden_proto(statvfs)
 #else
 # ifdef __REDIRECT
 extern int __REDIRECT (statvfs,
@@ -73,6 +74,7 @@ extern int statvfs64 (__const char *__restrict __file,
 #ifndef __USE_FILE_OFFSET64
 extern int fstatvfs (int __fildes, struct statvfs *__buf)
      __THROW __nonnull ((2));
+libc_hidden_proto(fstatvfs)
 #else
 # ifdef __REDIRECT
 extern int __REDIRECT (fstatvfs, (int __fildes, struct statvfs *__buf),
diff --git a/include/sys/syslog.h b/include/sys/syslog.h
index 3f5e6b297..8fc768846 100644
--- a/include/sys/syslog.h
+++ b/include/sys/syslog.h
@@ -179,12 +179,14 @@ __BEGIN_DECLS
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
 extern void closelog (void);
+libc_hidden_proto(closelog)
 
 /* Open connection to system logger.
 
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
 extern void openlog (__const char *__ident, int __option, int __facility);
+libc_hidden_proto(openlog)
 
 /* Set the log mask level.  */
 extern int setlogmask (int __mask) __THROW;
@@ -195,6 +197,7 @@ extern int setlogmask (int __mask) __THROW;
    marked with __THROW.  */
 extern void syslog (int __pri, __const char *__fmt, ...)
      __attribute__ ((__format__ (__printf__, 2, 3)));
+libc_hidden_proto(syslog)
 
 #ifdef __USE_BSD
 /* Generate a log message using FMT and using arguments pointed to by AP.
@@ -205,6 +208,7 @@ extern void syslog (int __pri, __const char *__fmt, ...)
    therefore not marked with __THROW.  */
 extern void vsyslog (int __pri, __const char *__fmt, __gnuc_va_list __ap)
      __attribute__ ((__format__ (__printf__, 2, 0)));
+libc_hidden_proto(vsyslog)
 #endif
 
 __END_DECLS
diff --git a/include/sys/time.h b/include/sys/time.h
index 73eeb2a2f..46b9b5667 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -79,6 +79,7 @@ libc_hidden_proto(gettimeofday)
 extern int settimeofday (__const struct timeval *__tv,
 			 __const struct timezone *__tz)
      __THROW __nonnull ((1));
+libc_hidden_proto(settimeofday)
 
 /* Adjust the current time of day by the amount in DELTA.
    If OLDDELTA is not NULL, it is filled in with the amount
@@ -133,12 +134,14 @@ extern int getitimer (__itimer_which_t __which,
 extern int setitimer (__itimer_which_t __which,
 		      __const struct itimerval *__restrict __new,
 		      struct itimerval *__restrict __old) __THROW;
+libc_hidden_proto(setitimer)
 
 /* Change the access time of FILE to TVP[0] and the modification time of
    FILE to TVP[1].  If TVP is a null pointer, use the current time instead.
    Returns 0 on success, -1 on errors.  */
 extern int utimes (__const char *__file, __const struct timeval __tvp[2])
      __THROW __nonnull ((1));
+libc_hidden_proto(utimes)
 
 #if 0 /*def __USE_BSD*/
 /* Same as `utimes', but does not follow symbolic links.  */
diff --git a/include/sys/times.h b/include/sys/times.h
index 6022f2f84..13535a5f6 100644
--- a/include/sys/times.h
+++ b/include/sys/times.h
@@ -47,6 +47,7 @@ struct tms
    Return the elapsed real time, or (clock_t) -1 for errors.
    All times are in CLK_TCKths of a second.  */
 extern clock_t times (struct tms *__buffer) __THROW;
+libc_hidden_proto(times)
 
 __END_DECLS
 
diff --git a/include/sys/timex.h b/include/sys/timex.h
index d2020a6d2..b4998f5ab 100644
--- a/include/sys/timex.h
+++ b/include/sys/timex.h
@@ -118,6 +118,7 @@ __BEGIN_DECLS
 
 extern int __adjtimex (struct timex *__ntx) __THROW;
 extern int adjtimex (struct timex *__ntx) __THROW;
+libc_hidden_proto(adjtimex)
 
 #if defined __UCLIBC_NTP_LEGACY__
 extern int ntp_gettime (struct ntptimeval *__ntv) __THROW;
diff --git a/include/sys/utsname.h b/include/sys/utsname.h
index ca195cb4d..41534d553 100644
--- a/include/sys/utsname.h
+++ b/include/sys/utsname.h
@@ -67,6 +67,7 @@ struct utsname
 
 /* Put information about the system in NAME.  */
 extern int uname (struct utsname *__name) __THROW;
+libc_hidden_proto(uname)
 
 
 __END_DECLS
diff --git a/include/sys/wait.h b/include/sys/wait.h
index 81a54fc3d..59ccd9331 100644
--- a/include/sys/wait.h
+++ b/include/sys/wait.h
@@ -137,6 +137,7 @@ extern __pid_t wait (__WAIT_STATUS __stat_loc);
    This function is a cancellation point and therefore not marked with
    __THROW.  */
 extern __pid_t waitpid (__pid_t __pid, int *__stat_loc, int __options);
+libc_hidden_proto(waitpid)
 
 #if defined __USE_SVID || defined __USE_XOPEN
 # define __need_siginfo_t
@@ -178,6 +179,7 @@ struct rusage;
 /* PID is like waitpid.  Other args are like wait3.  */
 extern __pid_t wait4 (__pid_t __pid, __WAIT_STATUS __stat_loc, int __options,
 		      struct rusage *__usage) __THROW;
+libc_hidden_proto(wait4)
 #endif /* Use BSD.  */
 
 
-- 
cgit v1.2.3