picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hurd: Fix symbols exposition

Browse source 
* 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.
This commit is contained in:
Samuel Thibault 2018-04-19 20:14:45 +02:00
parent 298d0e3129
commit 77b9339028
5 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -54,6 +54,12 @@
(struct statvfs64): Likewise. (struct statvfs64): Likewise.
* sysdeps/mach/hurd/bits/statfs.h (struct statfs, struct statfs64): * sysdeps/mach/hurd/bits/statfs.h (struct statfs, struct statfs64):
Likewise. 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 <joseph@codesourcery.com> 2018-04-18 Joseph Myers <joseph@codesourcery.com>

2
bits/in.h
View file

@ -44,6 +44,7 @@
#define IP_ADD_MEMBERSHIP 12 /* ip_mreq; add an IP group membership */ #define IP_ADD_MEMBERSHIP 12 /* ip_mreq; add an IP group membership */
#define IP_DROP_MEMBERSHIP 13 /* ip_mreq; drop 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. /* 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 The `ip_dst' field is used for the first-hop gateway when using a
source route (this gets put into the header proper). */ 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. */ struct in_addr ip_dst; /* First hop; zero without source route. */
char ip_opts[40]; /* Actually variable in size. */ char ip_opts[40]; /* Actually variable in size. */
}; };
#endif
/* Socket-level values for IPv6. */ /* Socket-level values for IPv6. */
#define SOL_IPV6 41 #define SOL_IPV6 41

2
conform/data/netinet/in.h-data
View file

@ -92,4 +92,6 @@ allow IPV6_*
allow IPPORT_* allow IPPORT_*
allow IPPROTO_* allow IPPROTO_*
allow SOCK_* allow SOCK_*
allow sin_*
allow sin6_*
#endif #endif

4
sysdeps/gnu/bits/msq.h
View file

@ -43,8 +43,8 @@ struct msqid_ds
__time_t msg_stime; /* time of last msgsnd command */ __time_t msg_stime; /* time of last msgsnd command */
__time_t msg_rtime; /* time of last msgrcv command */ __time_t msg_rtime; /* time of last msgrcv command */
__time_t msg_ctime; /* time of last change */ __time_t msg_ctime; /* time of last change */
struct wait_queue *__wwait; /* ??? */ struct __wait_queue *__wwait; /* ??? */
struct wait_queue *__rwait; /* ??? */ struct __wait_queue *__rwait; /* ??? */
unsigned short int __msg_cbytes;/* current number of bytes on queue */ unsigned short int __msg_cbytes;/* current number of bytes on queue */
msgqnum_t msg_qnum; /* number of messages currently on queue */ msgqnum_t msg_qnum; /* number of messages currently on queue */
msglen_t msg_qbytes; /* max number of bytes allowed on queue */ msglen_t msg_qbytes; /* max number of bytes allowed on queue */

2
sysdeps/gnu/bits/shm.h
View file

@ -58,7 +58,7 @@ struct shmid_ds
shmatt_t shm_nattch; /* number of current attaches */ shmatt_t shm_nattch; /* number of current attaches */
unsigned short int __shm_npages; /* size of segment (pages) */ unsigned short int __shm_npages; /* size of segment (pages) */
unsigned long int *__shm_pages; /* array of ptrs to frames -> SHMMAX */ 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 #ifdef __USE_MISC