From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <glibc-cvs-return-67643-listarch-glibc-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 118139 invoked by alias); 22 Jul 2019 09:03:41 -0000
Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <glibc-cvs.sourceware.org>
List-Archive: <http://sourceware.org/ml/glibc-cvs/>
List-Post: <mailto:glibc-cvs@sourceware.org>
List-Help: <mailto:glibc-cvs-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: glibc-cvs-owner@sourceware.org
List-Subscribe: <mailto:glibc-cvs-subscribe@sourceware.org>
Received: (qmail 118120 invoked by uid 9299); 22 Jul 2019 09:03:41 -0000
Date: Mon, 22 Jul 2019 09:03:00 -0000
Message-ID: <20190722090341.118119.qmail@sourceware.org>
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Florian Weimer <fw@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/fw/linux-5.2] Linux: Include <linux/sockios.h> in
 <bits/socket.h> under __USE_MISC
X-Act-Checkin: glibc
X-Git-Author: Florian Weimer <fweimer@redhat.com>
X-Git-Refname: refs/heads/fw/linux-5.2
X-Git-Oldrev: 3d03282e6687ffe595d201fa0c3a777179abb61f
X-Git-Newrev: c1d1e0c9f242f03521ef023a0e2cac071b5f0133
X-SW-Source: 2019-q3/txt/msg00108.txt.bz2

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c1d1e0c9f242f03521ef023a0e2cac071b5f0133

commit c1d1e0c9f242f03521ef023a0e2cac071b5f0133
Author: Florian Weimer <fweimer@redhat.com>
Date:   Mon Jul 22 11:01:17 2019 +0200

    Linux: Include <linux/sockios.h> in <bits/socket.h> under __USE_MISC
    
    Historically, <asm/socket.h> (which is included from <bits/socket.h>)
    provided ioctl operations for sockets.  User code accessed them
    through <sys/socket.h>.  The kernel UAPI headers have removed these
    definitions in favor of <linux/sockios.h>.  This commit makes them
    available via <sys/socket.h> again.

Diff:
---
 ChangeLog                             | 5 +++++
 sysdeps/unix/sysv/linux/bits/socket.h | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 15ed143..c6dbb2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-22  Florian Weimer  <fweimer@redhat.com>
+
+	* sysdeps/unix/sysv/linux/bits/socket.h [__USE_MISC]: Include
+	<linux/sockios.h>.
+
 2019-07-18  Florian Weimer  <fweimer@redhat.com>
 
 	* scripts/build-many-glibcs.py (Context.checkout): Default to
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 082f8b9..ff5b705 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -352,6 +352,7 @@ struct ucred
 #ifdef __USE_MISC
 # include <bits/types/time_t.h>
 # include <asm/socket.h>
+# include <linux/sockios.h>
 #else
 # define SO_DEBUG 1
 # include <bits/socket-constants.h>