Makeheader files be more like GNU

2 files changed, 46 insertions, 2 deletions

diff --git a/include/sys/syslog.h b/include/sys/syslog.h
index 38d74a03b..e11965e9b 100644
--- a/include/sys/syslog.h
+++ b/include/sys/syslog.h
@@ -181,7 +181,7 @@ __BEGIN_DECLS
 
 void	closelog __P((void));
 void	openlog __P((__const char *, int, int));
-int	setlogmask __P((int));
+void	setlogmask __P((int));
 void	syslog __P((int, __const char *, ...))
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5)
 	__attribute__ ((format (printf, 2, 0)))
diff --git a/include/sys/un.h b/include/sys/un.h
index efb674cc3..03f36058b 100644
--- a/include/sys/un.h
+++ b/include/sys/un.h
@@ -1 +1,45 @@
-#include <linux/un.h>
+/* Copyright (C) 1991, 1995, 1996 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.
+
+   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.
+
+   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.  */
+
+#ifndef	_SYS_UN_H
+#define	_SYS_UN_H	1
+
+#include <sys/cdefs.h>
+
+#include <string.h>		/* For prototype of `strlen'.  */
+
+/* Get the definition of the macro to define the common sockaddr members.  */
+#include <bits/sockaddr.h>
+
+__BEGIN_DECLS
+
+/* Structure describing the address of an AF_LOCAL (aka AF_UNIX) socket.  */
+struct sockaddr_un
+  {
+    __SOCKADDR_COMMON (sun_);
+    char sun_path[108];		/* Path name.  */
+  };
+
+
+/* Evaluate to actual length of the `sockaddr_un' structure.  */
+#define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path)	      \
+		      + strlen ((ptr)->sun_path))
+
+__END_DECLS
+
+#endif	/* sys/un.h  */