From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <pmderodat@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1914)
 id E08BA3AAB44F; Fri,  9 Jul 2021 12:39:54 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E08BA3AAB44F
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Pierre-Marie de Rodat <pmderodat@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-2216] [Ada] Add missed OS constant values
X-Act-Checkin: gcc
X-Git-Author: Dmitriy Anisimkov <anisimko@adacore.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: d206399a97bc0111cff30c66c535ce0884228b77
X-Git-Newrev: bb66a1021527ab68975a02cc3359c71c69ce443b
Message-Id: <20210709123954.E08BA3AAB44F@sourceware.org>
Date: Fri,  9 Jul 2021 12:39:54 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jul 2021 12:39:55 -0000

https://gcc.gnu.org/g:bb66a1021527ab68975a02cc3359c71c69ce443b

commit r12-2216-gbb66a1021527ab68975a02cc3359c71c69ce443b
Author: Dmitriy Anisimkov <anisimko@adacore.com>
Date:   Sun Jun 13 08:42:54 2021 +0600

    [Ada] Add missed OS constant values
    
    gcc/ada/
    
            * gsocket.h: Include net/if.h to get IF_NAMESIZE constant.
            * s-oscons-tmplt.c: Define IPV6_FLOWINFO for Linux.

Diff:
---
 gcc/ada/gsocket.h        | 1 +
 gcc/ada/s-oscons-tmplt.c | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/gcc/ada/gsocket.h b/gcc/ada/gsocket.h
index eb6e6d96593..a987594782b 100644
--- a/gcc/ada/gsocket.h
+++ b/gcc/ada/gsocket.h
@@ -215,6 +215,7 @@
 #if !(defined (VMS) || defined (__MINGW32__))
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <sys/ioctl.h>
diff --git a/gcc/ada/s-oscons-tmplt.c b/gcc/ada/s-oscons-tmplt.c
index f373c39b9c2..54fa2f1be0b 100644
--- a/gcc/ada/s-oscons-tmplt.c
+++ b/gcc/ada/s-oscons-tmplt.c
@@ -1689,8 +1689,14 @@ CND(IPV6_DSTOPTS, "Set the destination options delivery")
 CND(IPV6_HOPOPTS, "Set the hop options delivery")
 
 #ifndef IPV6_FLOWINFO
+#ifdef __linux__
+/* The IPV6_FLOWINFO is defined in linux/in6.h, but we can't include it because
+ * of conflicts with other headers. */
+# define IPV6_FLOWINFO 11
+#else
 # define IPV6_FLOWINFO -1
 #endif
+#endif
 CND(IPV6_FLOWINFO, "Set the flow ID delivery")
 
 #ifndef IPV6_HOPLIMIT