From 9a9fe3ad32b7f42650d6acdab484782320ae8e6d Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Sat, 17 Oct 2009 03:45:53 +0200
Subject: sync some headers and disable unused prototypes
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
include/sys/mman.h | 6 +++---
include/sys/poll.h | 2 --
include/sys/shm.h | 3 ++-
include/sys/socket.h | 9 +++++++--
include/sys/statvfs.h | 8 ++++----
include/sys/timex.h | 2 ++
include/sys/utsname.h | 23 ++++++++++++++++++-----
include/sys/wait.h | 2 +-
8 files changed, 37 insertions(+), 18 deletions(-)
(limited to 'include/sys')
diff --git a/include/sys/mman.h b/include/sys/mman.h
index 609f78a73..d46b92258 100644
--- a/include/sys/mman.h
+++ b/include/sys/mman.h
@@ -1,5 +1,5 @@
/* Definitions for BSD-style memory management.
- Copyright (C) 1994-2000, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1994-2000, 2003, 2004, 2005 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
@@ -59,8 +59,8 @@ extern void *mmap (void *__addr, size_t __len, int __prot,
int __flags, int __fd, __off_t __offset) __THROW;
libc_hidden_proto(mmap)
#else
-# ifdef __REDIRECT
-extern void * __REDIRECT (mmap,
+# ifdef __REDIRECT_NTH
+extern void * __REDIRECT_NTH (mmap,
(void *__addr, size_t __len, int __prot,
int __flags, int __fd, __off64_t __offset),
mmap64);
diff --git a/include/sys/poll.h b/include/sys/poll.h
index 13b913494..53ba6e2eb 100644
--- a/include/sys/poll.h
+++ b/include/sys/poll.h
@@ -30,8 +30,6 @@
/* Get the timespec definition. */
# define __need_timespec
# include <time.h>
-/* get NULL definition. */
-# include <stddef.h>
#endif
diff --git a/include/sys/shm.h b/include/sys/shm.h
index 8ec30b486..786ce752b 100644
--- a/include/sys/shm.h
+++ b/include/sys/shm.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000, 2002 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
@@ -41,6 +41,7 @@ typedef __pid_t pid_t;
# endif
#endif /* X/Open */
+
__BEGIN_DECLS
/* The following System V style IPC functions implement a shared memory
diff --git a/include/sys/socket.h b/include/sys/socket.h
index fb5135d3d..0824fc855 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -1,5 +1,6 @@
/* Declarations of socket constants, types, and functions.
- Copyright (C) 1991,92,1994-2001,2003 Free Software Foundation, Inc.
+ Copyright (C) 1991,92,1994-2001,2003,2005,2007,2008
+ 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
@@ -27,6 +28,10 @@ __BEGIN_DECLS
#include <sys/uio.h>
#define __need_size_t
#include <stddef.h>
+#ifdef __USE_GNU
+/* Get the __sigset_t definition. */
+# include <bits/sigset.h>
+#endif
/* This operating system-specific header file defines the SOCK_*, PF_*,
@@ -231,7 +236,7 @@ libc_hidden_proto(accept)
extern int shutdown (int __fd, int __how) __THROW;
-#ifdef __USE_XOPEN2K
+#if 0 /*def __USE_XOPEN2K*/
/* Determine wheter socket is at a out-of-band mark. */
extern int sockatmark (int __fd) __THROW;
#endif
diff --git a/include/sys/statvfs.h b/include/sys/statvfs.h
index e755bafc1..6199c5d02 100644
--- a/include/sys/statvfs.h
+++ b/include/sys/statvfs.h
@@ -54,8 +54,8 @@ extern int statvfs (__const char *__restrict __file,
__THROW __nonnull ((1, 2));
libc_hidden_proto(statvfs)
#else
-# ifdef __REDIRECT
-extern int __REDIRECT (statvfs,
+# ifdef __REDIRECT_NTH
+extern int __REDIRECT_NTH (statvfs,
(__const char *__restrict __file,
struct statvfs *__restrict __buf), statvfs64)
__nonnull ((1, 2));
@@ -76,8 +76,8 @@ extern int fstatvfs (int __fildes, struct statvfs *__buf)
__THROW __nonnull ((2));
libc_hidden_proto(fstatvfs)
#else
-# ifdef __REDIRECT
-extern int __REDIRECT (fstatvfs, (int __fildes, struct statvfs *__buf),
+# ifdef __REDIRECT_NTH
+extern int __REDIRECT_NTH (fstatvfs, (int __fildes, struct statvfs *__buf),
fstatvfs64) __nonnull ((2));
# else
# define fstatvfs fstatvfs64
diff --git a/include/sys/timex.h b/include/sys/timex.h
index b4998f5ab..5e82d464d 100644
--- a/include/sys/timex.h
+++ b/include/sys/timex.h
@@ -116,7 +116,9 @@ struct timex
__BEGIN_DECLS
+#if 0
extern int __adjtimex (struct timex *__ntx) __THROW;
+#endif
extern int adjtimex (struct timex *__ntx) __THROW;
libc_hidden_proto(adjtimex)
diff --git a/include/sys/utsname.h b/include/sys/utsname.h
index 41534d553..7b57888ce 100644
--- a/include/sys/utsname.h
+++ b/include/sys/utsname.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 94, 96, 97, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,96,97,99,2002 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
@@ -29,26 +29,38 @@ __BEGIN_DECLS
#include <bits/utsname.h>
+#ifndef _UTSNAME_SYSNAME_LENGTH
+# define _UTSNAME_SYSNAME_LENGTH _UTSNAME_LENGTH
+#endif
#ifndef _UTSNAME_NODENAME_LENGTH
# define _UTSNAME_NODENAME_LENGTH _UTSNAME_LENGTH
#endif
+#ifndef _UTSNAME_RELEASE_LENGTH
+# define _UTSNAME_RELEASE_LENGTH _UTSNAME_LENGTH
+#endif
+#ifndef _UTSNAME_VERSION_LENGTH
+# define _UTSNAME_VERSION_LENGTH _UTSNAME_LENGTH
+#endif
+#ifndef _UTSNAME_MACHINE_LENGTH
+# define _UTSNAME_MACHINE_LENGTH _UTSNAME_LENGTH
+#endif
/* Structure describing the system and machine. */
struct utsname
{
/* Name of the implementation of the operating system. */
- char sysname[_UTSNAME_LENGTH];
+ char sysname[_UTSNAME_SYSNAME_LENGTH];
/* Name of this node on the network. */
char nodename[_UTSNAME_NODENAME_LENGTH];
/* Current release level of this implementation. */
- char release[_UTSNAME_LENGTH];
+ char release[_UTSNAME_RELEASE_LENGTH];
/* Current version level of this release. */
- char version[_UTSNAME_LENGTH];
+ char version[_UTSNAME_VERSION_LENGTH];
/* Name of the hardware type the system is running on. */
- char machine[_UTSNAME_LENGTH];
+ char machine[_UTSNAME_MACHINE_LENGTH];
#if _UTSNAME_DOMAIN_LENGTH - 0
/* Name of the domain of this node on the network. */
@@ -61,6 +73,7 @@ struct utsname
};
#ifdef __USE_SVID
+/* Note that SVID assumes all members have the same size. */
# define SYS_NMLN _UTSNAME_LENGTH
#endif
diff --git a/include/sys/wait.h b/include/sys/wait.h
index 59ccd9331..f283fe228 100644
--- a/include/sys/wait.h
+++ b/include/sys/wait.h
@@ -85,7 +85,7 @@ typedef union
# define WIFEXITED(status) __WIFEXITED(__WAIT_INT(status))
# define WIFSIGNALED(status) __WIFSIGNALED(__WAIT_INT(status))
# define WIFSTOPPED(status) __WIFSTOPPED(__WAIT_INT(status))
-# if 0 /*def __WIFCONTINUED*/
+# ifdef __WIFCONTINUED
# define WIFCONTINUED(status) __WIFCONTINUED(__WAIT_INT(status))
# endif
#endif /* <stdlib.h> not included. */
--
cgit v1.2.3