summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--libio/fileops.c4
-rw-r--r--libio/freopen.c5
-rw-r--r--libio/freopen64.c5
-rw-r--r--misc/syslog.c2
-rw-r--r--nscd/connections.c7
-rw-r--r--nscd/netgroupcache.c7
-rw-r--r--sysdeps/posix/getcwd.c3
8 files changed, 28 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e71ac6237..279fbd6b3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-05-10 Thomas Schwinge <thomas@schwinge.name>
+
+ * libio/fileops.c: Unconditionally include <kernel-features.h>.
+ * libio/freopen.c: Likewise.
+ * libio/freopen64.c: Likewise.
+ * misc/syslog.c: Likewise.
+ * nscd/connections.c: Likewise.
+ * nscd/netgroupcache.c: Likewise.
+ * sysdeps/posix/getcwd.c: Likewise.
+
2012-05-10 Roland McGrath <roland@hack.frob.com>
* math/w_ilogbf.c: Add #include <limits.h>.
diff --git a/libio/fileops.c b/libio/fileops.c
index a2e8dacd77..93750f8084 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997-2005, 2006, 2007, 2008, 2009, 2011-2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Per Bothner <bothner@cygnus.com>.
@@ -46,6 +45,7 @@
# include "../iconv/gconv_int.h"
# include <shlib-compat.h>
# include <not-cancel.h>
+# include <kernel-features.h>
#endif
#ifndef errno
extern int errno;
diff --git a/libio/freopen.c b/libio/freopen.c
index 418f412f32..025c55b655 100644
--- a/libio/freopen.c
+++ b/libio/freopen.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993,95,96,97,98,2000,2001,2002,2003,2008,2011
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -34,6 +33,8 @@
#include <shlib-compat.h>
#include <fd_to_filename.h>
+#include <kernel-features.h>
+
FILE*
freopen (filename, mode, fp)
const char* filename;
diff --git a/libio/freopen64.c b/libio/freopen64.c
index 7e1beeff33..24d0360625 100644
--- a/libio/freopen64.c
+++ b/libio/freopen64.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993,1995,1996,1997,1998,2000,2001,2002, 2003, 2008, 2011
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -33,6 +32,8 @@
#include <fd_to_filename.h>
+#include <kernel-features.h>
+
FILE *
freopen64 (filename, mode, fp)
const char* filename;
diff --git a/misc/syslog.c b/misc/syslog.c
index 57d4db9b5b..4e18883f50 100644
--- a/misc/syslog.c
+++ b/misc/syslog.c
@@ -56,6 +56,8 @@ static char sccsid[] = "@(#)syslog.c 8.4 (Berkeley) 3/18/94";
#include <libio/iolibio.h>
#include <math_ldbl_opt.h>
+#include <kernel-features.h>
+
#define ftell(s) INTUSE(_IO_ftell) (s)
static int LogType = SOCK_DGRAM; /* type of socket connection */
diff --git a/nscd/connections.c b/nscd/connections.c
index a8f287ef3e..77b9ac40a3 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -1,5 +1,5 @@
/* Inner loops of cache daemon.
- Copyright (C) 1998-2007, 2008, 2009, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1998-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -56,9 +56,8 @@
#include "dbg_log.h"
#include "selinux.h"
#include <resolv/resolv.h>
-#ifdef HAVE_SENDFILE
-# include <kernel-features.h>
-#endif
+
+#include <kernel-features.h>
/* Support to run nscd as an unprivileged user */
diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c
index 276e66ff44..70cf9c14b3 100644
--- a/nscd/netgroupcache.c
+++ b/nscd/netgroupcache.c
@@ -1,5 +1,5 @@
/* Cache handling for netgroup lookup.
- Copyright (C) 2011 Free Software Foundation, Inc.
+ Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
@@ -27,9 +27,8 @@
#include "../inet/netgroup.h"
#include "nscd.h"
#include "dbg_log.h"
-#ifdef HAVE_SENDFILE
-# include <kernel-features.h>
-#endif
+
+#include <kernel-features.h>
/* This is the standard reply in case the service is disabled. */
diff --git a/sysdeps/posix/getcwd.c b/sysdeps/posix/getcwd.c
index 6c41977eb0..1dc45e8ee2 100644
--- a/sysdeps/posix/getcwd.c
+++ b/sysdeps/posix/getcwd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1999,2011-2012 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -173,6 +173,7 @@ extern char *alloca ();
#if defined _LIBC
# include <not-cancel.h>
+# include <kernel-features.h>
#else
# define openat64_not_cancel_3(dfd, name, mode) openat64 (dfd, name, mode)
# define close_not_cancel_no_status(fd) close (fd)