Rev all the header files to sync things with glibc 2.2.4

1 files changed, 31 insertions, 18 deletions

diff --git a/include/sys/shm.h b/include/sys/shm.h
index 09e21d60e..1ef669ba4 100644
--- a/include/sys/shm.h
+++ b/include/sys/shm.h
@@ -1,28 +1,28 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1995-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
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #ifndef _SYS_SHM_H
 #define _SYS_SHM_H	1
 
 #include <features.h>
 
-#include <unistd.h>		/* for `getpagesize' declaration */
-#include <sys/types.h>
+#define __need_size_t
+#include <stddef.h>
 
 /* Get common definition of System V style IPC.  */
 #include <sys/ipc.h>
@@ -30,26 +30,39 @@
 /* Get system dependent definition of `struct shmid_ds' and more.  */
 #include <bits/shm.h>
 
+/* Define types required by the standard.  */
+#define __need_time_t
+#include <time.h>
+
+#ifdef __USE_XOPEN
+# ifndef __pid_t_defined
+typedef __pid_t pid_t;
+#  define __pid_t_defined
+# endif
+#endif	/* X/Open */
+
+__BEGIN_DECLS
 
 /* Segment low boundary address multiple.  */
-#define SHMLBA		(getpagesize ())
+#define SHMLBA		(__getpagesize ())
+extern int __getpagesize (void) __THROW __attribute__ ((__const__));
+
 
 /* The following System V style IPC functions implement a shared memory
    facility.  The definition is found in XPG4.2.  */
 
-__BEGIN_DECLS
-
 /* Shared memory control operation.  */
-extern int shmctl __P ((int __shmid, int __cmd, struct shmid_ds *__buf));
+extern int shmctl (int __shmid, int __cmd, struct shmid_ds *__buf) __THROW;
 
 /* Get shared memory segment.  */
-extern int shmget __P ((key_t __key, size_t __size, int __shmflg));
+extern int shmget (key_t __key, size_t __size, int __shmflg) __THROW;
 
 /* Attach shared memory segment.  */
-extern void *shmat __P ((int __shmid, __const void *__shmaddr, int __shmflg));
+extern void *shmat (int __shmid, __const void *__shmaddr, int __shmflg)
+     __THROW;
 
 /* Detach shared memory segment.  */
-extern int shmdt __P ((__const void *__shmaddr));
+extern int shmdt (__const void *__shmaddr) __THROW;
 
 __END_DECLS