aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-01-24 20:36:21 +0000
committerRoland McGrath <roland@gnu.org>1996-01-24 20:36:21 +0000
commit555f3a396ae65187cac996b2302c95cc52541d49 (patch)
tree9e432b5593f61d7cd854e8b1355d076e21c032b7
parent914d9d7bdfdafd7a7c4416cb6f58bb5e844d3482 (diff)
downloadglibc-555f3a396ae65187cac996b2302c95cc52541d49.zip
glibc-555f3a396ae65187cac996b2302c95cc52541d49.tar.gz
glibc-555f3a396ae65187cac996b2302c95cc52541d49.tar.bz2
* sysdeps/unix/sysv/linux/fcntlbits.h: Moved from linux/i386.
* Makerules: Use -include for generated makefiles. * errno.h: Don't declare errno if it's defined as a macro.
-rw-r--r--ChangeLog6
-rw-r--r--Makerules6
-rw-r--r--errno.h10
-rw-r--r--sysdeps/unix/sysv/linux/fcntlbits.h26
4 files changed, 43 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b50f6cd..d8afaa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
Wed Jan 24 03:22:07 1996 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
+ * sysdeps/unix/sysv/linux/fcntlbits.h: Moved from linux/i386.
+
+ * Makerules: Use -include for generated makefiles.
+
+ * errno.h: Don't declare errno if it's defined as a macro.
+
* stdio-common/vfscanf.c: Disallow l flag after ll or L.
* stdio-common/Makefile (tests): Add scanf[1-9].
diff --git a/Makerules b/Makerules
index 0013b53..3fcf403 100644
--- a/Makerules
+++ b/Makerules
@@ -80,7 +80,7 @@ vpath %.h $(subst $(empty) ,:,$(strip $(common-objpfx) \
in-Makerules := yes
ifndef avoid-generated
-include $(+sysdir_pfx)sysd-Makefile
+-include $(+sysdir_pfx)sysd-Makefile
ifneq ($(sysd-Makefile-sysdirs),$(sysdirs))
sysd-Makefile-force = FORCE
FORCE:
@@ -198,7 +198,7 @@ endif
# included. It might define inhibit-sysdep-asm, which would affect the
# contents of sysd-rules.
ifdef sysd-Makefile-done
-include $(+sysdir_pfx)sysd-rules
+-include $(+sysdir_pfx)sysd-rules
ifneq ($(sysd-rules-sysdirs),$(sysdirs))
# The value of $(sysdirs) the sysd-rules was computed for
# differs from the one we are using now. So force a rebuild of sysd-rules.
@@ -313,7 +313,7 @@ endif
ifdef +depfiles
ifneq ($(no_deps),t)
-include $(+depfiles)
+-include $(+depfiles)
endif
endif
diff --git a/errno.h b/errno.h
index 0bcbc96..e4c8a4e 100644
--- a/errno.h
+++ b/errno.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 95, 96 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
@@ -37,8 +37,14 @@ __BEGIN_DECLS
#undef __need_Emath
#ifdef _ERRNO_H
-/* Declare the `errno' variable. */
+/* Declare the `errno' variable, unless it's defined as a macro by
+ errnos.h. This is the case in GNU, where it is a per-thread variable.
+ This redeclaration using the macro still works, but it will be a
+ function declaration without a prototype and may trigger a
+ -Wstrict-prototypes warning. */
+#ifndef errno
extern int errno;
+#endif
#ifdef __USE_GNU
/* The full and simple forms of the name with which the program was
diff --git a/sysdeps/unix/sysv/linux/fcntlbits.h b/sysdeps/unix/sysv/linux/fcntlbits.h
new file mode 100644
index 0000000..8d92ac0
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/fcntlbits.h
@@ -0,0 +1,26 @@
+/* O_*, F_*, FD_* bit values for Linux.
+Copyright (C) 1995 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 _FCNTLBITS_H
+#define _FCNTLBITS_H 1
+
+#include <sys/types.h>
+#include <linux/fcntl.h>
+
+#endif /* fcntlbits.h */