From patchwork Thu Apr 19 18:16:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 901425 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-91730-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="t7iXiRF8"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40RnHZ4LLCz9s1v for ; Fri, 20 Apr 2018 04:16:26 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=W1COaKNdCm20jLDG8N9ZHeeanPWZgFkXqzXXnKev9jNYfdT7bPnhL YcTFQTadYjX1tS/l8XfZ37u3zV25kc9P33KsR+bYOIiGGCofiJ2qfsqaSMhptabz HyFPzCofSonBfT0qLqAqSXNyq57pEWaWI6oR/SAON63JmirvGl4C4M= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; s=default; bh=jtRJzQ1Qbtzqt9Ozc7FHK423tEg=; b=t7iXiRF8b2FY+d3VtYZVJx3QWFC0 rRACsGwJ6NNh4lQ2ZUOH1iXot87gtDTgOE74t7w1Hkfkhbgj9bFZArL7rx7khlIS pw4l6P3WmC9e3RrtnVWbtlEJEIzDfmpS0BcUljjtlyjSG8Q8uuDNwXMfm0SroBfy NZ65cspX4rSjmfA= Received: (qmail 115609 invoked by alias); 19 Apr 2018 18:16:20 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 115588 invoked by uid 89); 19 Apr 2018 18:16:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, URIBL_RED autolearn=ham version=3.3.2 spammy=membership, Structure X-HELO: mail3-relais-sop.national.inria.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited] hurd: Fix symbols exposition Date: Thu, 19 Apr 2018 20:16:06 +0200 Message-Id: <20180419181606.51248-1-samuel.thibault@ens-lyon.org> * bits/in.h [!__USE_MISC]: Do not define struct ip_opts. * conform/data/netinet/in.h-data: Allow sin_ and sin6_ prefix. * sysdeps/gnu/bits/msq.h (struct msqid_ds): Use __wait_queue struct instead of wait_queue. * sysdeps/gnu/bits/shm.h (struct shmid_ds): Use __vm_area_struct instead of vm_area_struct. --- ChangeLog | 6 ++++++ bits/in.h | 2 ++ conform/data/netinet/in.h-data | 2 ++ sysdeps/gnu/bits/msq.h | 4 ++-- sysdeps/gnu/bits/shm.h | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93c82fef99..13b9640935 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,12 @@ (struct statvfs64): Likewise. * sysdeps/mach/hurd/bits/statfs.h (struct statfs, struct statfs64): Likewise. + * bits/in.h [!__USE_MISC]: Do not define struct ip_opts. + * conform/data/netinet/in.h-data: Allow sin_ and sin6_ prefix. + * sysdeps/gnu/bits/msq.h (struct msqid_ds): Use __wait_queue struct + instead of wait_queue. + * sysdeps/gnu/bits/shm.h (struct shmid_ds): Use __vm_area_struct + instead of vm_area_struct. 2018-04-18 Joseph Myers diff --git a/bits/in.h b/bits/in.h index aa683a59fb..1e854fddfb 100644 --- a/bits/in.h +++ b/bits/in.h @@ -44,6 +44,7 @@ #define IP_ADD_MEMBERSHIP 12 /* ip_mreq; add an IP group membership */ #define IP_DROP_MEMBERSHIP 13 /* ip_mreq; drop an IP group membership */ +#ifdef __USE_MISC /* Structure used to describe IP options for IP_OPTIONS and IP_RETOPTS. The `ip_dst' field is used for the first-hop gateway when using a source route (this gets put into the header proper). */ @@ -52,6 +53,7 @@ struct ip_opts struct in_addr ip_dst; /* First hop; zero without source route. */ char ip_opts[40]; /* Actually variable in size. */ }; +#endif /* Socket-level values for IPv6. */ #define SOL_IPV6 41 diff --git a/conform/data/netinet/in.h-data b/conform/data/netinet/in.h-data index ac26a74e9e..ccc74db608 100644 --- a/conform/data/netinet/in.h-data +++ b/conform/data/netinet/in.h-data @@ -92,4 +92,6 @@ allow IPV6_* allow IPPORT_* allow IPPROTO_* allow SOCK_* +allow sin_* +allow sin6_* #endif diff --git a/sysdeps/gnu/bits/msq.h b/sysdeps/gnu/bits/msq.h index d38b984fa5..0a4a67d5e9 100644 --- a/sysdeps/gnu/bits/msq.h +++ b/sysdeps/gnu/bits/msq.h @@ -43,8 +43,8 @@ struct msqid_ds __time_t msg_stime; /* time of last msgsnd command */ __time_t msg_rtime; /* time of last msgrcv command */ __time_t msg_ctime; /* time of last change */ - struct wait_queue *__wwait; /* ??? */ - struct wait_queue *__rwait; /* ??? */ + struct __wait_queue *__wwait; /* ??? */ + struct __wait_queue *__rwait; /* ??? */ unsigned short int __msg_cbytes;/* current number of bytes on queue */ msgqnum_t msg_qnum; /* number of messages currently on queue */ msglen_t msg_qbytes; /* max number of bytes allowed on queue */ diff --git a/sysdeps/gnu/bits/shm.h b/sysdeps/gnu/bits/shm.h index d9944f8c08..eef6729188 100644 --- a/sysdeps/gnu/bits/shm.h +++ b/sysdeps/gnu/bits/shm.h @@ -58,7 +58,7 @@ struct shmid_ds shmatt_t shm_nattch; /* number of current attaches */ unsigned short int __shm_npages; /* size of segment (pages) */ unsigned long int *__shm_pages; /* array of ptrs to frames -> SHMMAX */ - struct vm_area_struct *__attaches; /* descriptors for attaches */ + struct __vm_area_struct *__attaches; /* descriptors for attaches */ }; #ifdef __USE_MISC