This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
protect <bits/utsname.h> files against inclusion
- From: Bruno Haible <bruno at clisp dot org>
- To: libc-alpha at sources dot redhat dot com
- Date: Mon, 8 Jul 2002 13:59:25 +0200 (CEST)
- Subject: protect <bits/utsname.h> files against inclusion
Hi,
The protection against direct inclusion of <bits/utsname.h> in the SunOS4
and Ultrix4 ports is incorrect: it tests for the macro _UTSNAME_H but
<sys/utsname.h> defines the macro _SYS_UTSNAME_H.
2002-07-06 Bruno Haible <bruno@clisp.org>
* sysdeps/unix/bsd/sun/sunos4/bits/utsname.h: Test for _SYS_UTSNAME_H,
not _UTSNAME_H.
* sysdeps/unix/bsd/ultrix4/bits/utsname.h: Likewise.
diff -r -c3 glibc-20020627.bak/sysdeps/unix/bsd/sun/sunos4/bits/utsname.h glibc-20020627/sysdeps/unix/bsd/sun/sunos4/bits/utsname.h
--- glibc-20020627.bak/sysdeps/unix/bsd/sun/sunos4/bits/utsname.h Tue Jul 10 23:01:23 2001
+++ glibc-20020627/sysdeps/unix/bsd/sun/sunos4/bits/utsname.h Fri Jul 5 01:17:10 2002
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 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
@@ -16,7 +16,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#ifndef _UTSNAME_H
+#ifndef _SYS_UTSNAME_H
# error "Never include <bits/utsname.h> directly; use <sys/utsname.h> instead."
#endif
diff -r -c3 glibc-20020627.bak/sysdeps/unix/bsd/ultrix4/bits/utsname.h glibc-20020627/sysdeps/unix/bsd/ultrix4/bits/utsname.h
--- glibc-20020627.bak/sysdeps/unix/bsd/ultrix4/bits/utsname.h Tue Jul 10 23:01:24 2001
+++ glibc-20020627/sysdeps/unix/bsd/ultrix4/bits/utsname.h Fri Jul 5 01:17:11 2002
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 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
@@ -16,7 +16,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#ifndef _UTSNAME_H
+#ifndef _SYS_UTSNAME_H
# error "Never include <bits/utsname.h> directly; use <sys/utsname.h> instead."
#endif