Don't use transparent unions in C++.

[kopensolaris-gnu/glibc.git] / posix / sys / utsname.h

diff --git a/posix/sys/utsname.h b/posix/sys/utsname.h
index 0d8ce81..629dd59 100644 (file)
--- a/posix/sys/utsname.h
+++ b/posix/sys/utsname.h
@@ -1,33 +1,37 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 1992, 1994, 1996, 1997 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 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.
+   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, 1992 Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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.  */
 
 /*
  *     POSIX Standard: 4.4 System Identification       <sys/utsname.h>
  */
 
 #ifndef        _SYS_UTSNAME_H
-
 #define        _SYS_UTSNAME_H  1
+
 #include <features.h>
 
 __BEGIN_DECLS
 
-#include <utsnamelen.h>
+#include <bits/utsname.h>
+
+#ifndef _UTSNAME_NODENAME_LENGTH
+# define _UTSNAME_NODENAME_LENGTH _UTSNAME_LENGTH
+#endif
 
 /* Structure describing the system and machine.  */
 struct utsname
@@ -36,7 +40,7 @@ struct utsname
     char sysname[_UTSNAME_LENGTH];
 
     /* Name of this node on the network.  */
-    char nodename[_UTSNAME_LENGTH];
+    char nodename[_UTSNAME_NODENAME_LENGTH];
 
     /* Current release level of this implementation.  */
     char release[_UTSNAME_LENGTH];
@@ -45,8 +49,21 @@ struct utsname
 
     /* Name of the hardware type the system is running on.  */
     char machine[_UTSNAME_LENGTH];
+
+#if _UTSNAME_DOMAIN_LENGTH - 0
+    /* Name of the domain of this node on the network.  */
+# ifdef __USE_GNU
+    char domainname[_UTSNAME_DOMAIN_LENGTH];
+# else
+    char __domainname[_UTSNAME_DOMAIN_LENGTH];
+# endif
+#endif
   };
 
+#ifdef __USE_SVID
+# define SYS_NMLN  _UTSNAME_LENGTH
+#endif
+
 
 /* Put information about the system in NAME.  */
 extern int uname __P ((struct utsname *__name));