From a784e502472fb3a1afa4d01a47c66b52d23e00f6 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@gmail.com>
Date: Sat, 7 Jan 2012 23:57:22 -0500
Subject: Remove pre-ISO C support

No more __const.
---
 socket/send.c       |  4 ++--
 socket/sendto.c     |  4 ++--
 socket/sys/socket.h | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'socket')

diff --git a/socket/send.c b/socket/send.c
index 7f94fbb..14ef9df 100644
--- a/socket/send.c
+++ b/socket/send.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1995,1996,1997,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1995,1996,1997,2001,2002,2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
 ssize_t
 __send (fd, buf, n, flags)
      int fd;
-     __const __ptr_t buf;
+     const __ptr_t buf;
      size_t n;
      int flags;
 {
diff --git a/socket/sendto.c b/socket/sendto.c
index 823c9dd..55adfe7 100644
--- a/socket/sendto.c
+++ b/socket/sendto.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1995,1996,1997,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1995-1997,2001,2002,2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
 ssize_t
 __sendto (fd, buf, n, flags, addr, addr_len)
      int fd;
-     __const __ptr_t buf;
+     const __ptr_t buf;
      size_t n;
      int flags;
      __CONST_SOCKADDR_ARG addr;
diff --git a/socket/sys/socket.h b/socket/sys/socket.h
index 9b1f56f..6fb51d7 100644
--- a/socket/sys/socket.h
+++ b/socket/sys/socket.h
@@ -1,5 +1,5 @@
 /* Declarations of socket constants, types, and functions.
-   Copyright (C) 1991,92,1994-2001,2003,2005,2007,2008
+   Copyright (C) 1991,92,1994-2001,2003,2005,2007,2008,2012
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -69,7 +69,7 @@ enum
    old-style declaration, too.  */
 #if defined __cplusplus || !__GNUC_PREREQ (2, 7) || !defined __USE_GNU
 # define __SOCKADDR_ARG		struct sockaddr *__restrict
-# define __CONST_SOCKADDR_ARG	__const struct sockaddr *
+# define __CONST_SOCKADDR_ARG	const struct sockaddr *
 #else
 /* Add more `struct sockaddr_AF' types here as necessary.
    These are all the ones I found on NetBSD and Linux.  */
@@ -92,7 +92,7 @@ enum
 typedef union { __SOCKADDR_ALLTYPES
 	      } __SOCKADDR_ARG __attribute__ ((__transparent_union__));
 # undef __SOCKADDR_ONETYPE
-# define __SOCKADDR_ONETYPE(type) __const struct type *__restrict __##type##__;
+# define __SOCKADDR_ONETYPE(type) const struct type *__restrict __##type##__;
 typedef union { __SOCKADDR_ALLTYPES
 	      } __CONST_SOCKADDR_ARG __attribute__ ((__transparent_union__));
 # undef __SOCKADDR_ONETYPE
@@ -138,7 +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);
+extern ssize_t send (int __fd, const void *__buf, size_t __n, int __flags);
 
 /* Read N bytes into BUF from socket FD.
    Returns the number read or -1 for errors.
@@ -152,7 +152,7 @@ extern ssize_t recv (int __fd, void *__buf, size_t __n, int __flags);
 
    This function is a cancellation point and therefore not marked with
    __THROW.  */
-extern ssize_t sendto (int __fd, __const void *__buf, size_t __n,
+extern ssize_t sendto (int __fd, const void *__buf, size_t __n,
 		       int __flags, __CONST_SOCKADDR_ARG __addr,
 		       socklen_t __addr_len);
 
@@ -173,7 +173,7 @@ extern ssize_t recvfrom (int __fd, void *__restrict __buf, size_t __n,
 
    This function is a cancellation point and therefore not marked with
    __THROW.  */
-extern ssize_t sendmsg (int __fd, __const struct msghdr *__message,
+extern ssize_t sendmsg (int __fd, const struct msghdr *__message,
 			int __flags);
 
 /* Receive a message as described by MESSAGE from socket FD.
@@ -195,7 +195,7 @@ extern int getsockopt (int __fd, int __level, int __optname,
    to *OPTVAL (which is OPTLEN bytes long).
    Returns 0 on success, -1 for errors.  */
 extern int setsockopt (int __fd, int __level, int __optname,
-		       __const void *__optval, socklen_t __optlen) __THROW;
+		       const void *__optval, socklen_t __optlen) __THROW;
 
 
 /* Prepare to accept connections on socket FD.
-- 
cgit v1.1