diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-02-25 09:00:58 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-02-25 09:00:58 +0000 |
| commit | bba09d234b3cfaa311809278c4252fc906f06de2 (patch) | |
| tree | 2a372fc7594a100e4be8a6482112aeefd5fa5aca /sysvipc/sys | |
| parent | 8934380c5b577346635773210336414d80c5d4ba (diff) | |
| download | glibc-bba09d234b3cfaa311809278c4252fc906f06de2.tar.gz glibc-bba09d234b3cfaa311809278c4252fc906f06de2.tar.xz glibc-bba09d234b3cfaa311809278c4252fc906f06de2.zip | |
Update.
2000-02-25 Ulrich Drepper <drepper@redhat.com> * conform/conformtest.pl (@headers): Add "sys/msg.h", "sys/mman.h", "sys/ipc.h", "syslog.h", and "stropts.h". Handle / in header names correctly. * conform/data/stropts.h-data: New file. * conform/data/syslog.h-data: New file. * conform/data/sys/ipc.h-data: New file. * conform/data/sys/mman.h-data: New file. * conform/data/sys/msg.h-data: New file. * misc/sys/mman.h: Define off_t and mode_t if not already done. * streams/stropts.h: Define gid_t and uid_t if not already done. * sysdeps/gnu/bits/ipc.h (IPC_INFO): Only define if __USE_GNU. * sysdeps/unix/sysv/linux/alpha/bits/ipc.h: Likewise. * sysdeps/unix/sysv/linux/bits/ipc.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/ipc.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/ipc.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/ipc.h: Likewise. * sysvipc/sys/msg.h: Don't include sys/types.h. Define time_t, pid_t, and ssize_t if not already done. (struct msgbuf): Define only if __USE_GNU. * sysdeps/generic/bits/msq.h: Include bits/types.h, not sys/types.h. (MSG_EXCEPT): Only define if __USE_GNU. Define msgqnum_t and msglen_t and use them in struct msqid_ds definition. * sysdeps/gnu/bits/msq.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/msq.h: Likewise. * sysdeps/unix/sysv/linux/bits/msq.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/msq.h: Likewise. * sysdeps/generic/bits/stropts.h (I_GWROPT): Renamed from I_GWRSET. (FLUSHBAND): Only define is __USE_GNU. (RPROTMASK): Likewise. (SNDPIPE): Likewise. (MUXID_ALL): Likewise. (struct strrecvfd): Rename fill to __fill.
Diffstat (limited to 'sysvipc/sys')
| -rw-r--r-- | sysvipc/sys/msg.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sysvipc/sys/msg.h b/sysvipc/sys/msg.h index 2a726dc654..967ce0c87d 100644 --- a/sysvipc/sys/msg.h +++ b/sysvipc/sys/msg.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 1999, 2000 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 @@ -20,7 +20,6 @@ #define _SYS_MSG_H #include <features.h> -#include <sys/types.h> /* Get common definition of System V style IPC. */ #include <sys/ipc.h> @@ -28,15 +27,31 @@ /* Get system dependent definition of `struct msqid_ds' and more. */ #include <bits/msq.h> +/* Define types required by the standard. */ +#define __need_time_t +#include <time.h> + +#ifndef __pid_t_defined +typedef __pid_t pid_t; +# define __pid_t_defined +#endif + +#ifndef __ssize_t_defined +typedef __ssize_t ssize_t; +# define __ssize_t_defined +#endif + /* The following System V style IPC functions implement a message queue system. The definition is found in XPG2. */ +#ifdef __USE_GNU /* Template for struct to be used as argument for `msgsnd' and `msgrcv'. */ struct msgbuf { long int mtype; /* type of received/sent message */ char mtext[1]; /* text of the message */ }; +#endif __BEGIN_DECLS |