summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-05-28 16:43:59 +0000
committerUlrich Drepper <drepper@redhat.com>2007-05-28 16:43:59 +0000
commit40f57573d02e98db90f7d9e1dae6c3422d150d7b (patch)
tree2b25b4dba22a7197fca16c8199a30f7aa0b1cf5b
parent991fa82be561407e9cfb42a328b2b56d5a9debf1 (diff)
downloadglibc-40f57573d02e98db90f7d9e1dae6c3422d150d7b.tar.gz
* sysdeps/unix/sysv/linux/futimes.c (miss_utimensat): Don't define
if __NR_utimensat is not defined.
-rw-r--r--ChangeLog5
-rw-r--r--nptl/ChangeLog3
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstacksize.c1
-rw-r--r--sysdeps/unix/sysv/linux/futimes.c4
4 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b7586ef06f..5f17fd5014 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-28 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/futimes.c (miss_utimensat): Don't define
+ if __NR_utimensat is not defined.
+
2007-05-26 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/powerpc/libc-start.c: Include <sysdep.h>.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index beb5ae2448..e2a18504fa 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
2007-05-28 Jakub Jelinek <jakub@redhat.com>
+ * sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstacksize.c: Include
+ unistd.h.
+
* sysdeps/i386/tls.h (THREAD_GSCOPE_RESET_FLAG): Use explicit
insn suffix.
(THREAD_GSCOPE_GET_FLAG): Remove.
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstacksize.c b/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstacksize.c
index 9472dd17ef..6fedac1b33 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstacksize.c
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstacksize.c
@@ -1,3 +1,4 @@
+#include <unistd.h> /* For __getpagesize. */
#define NEW_VERNUM GLIBC_2_6
#define STACKSIZE_ADJUST \
do { \
diff --git a/sysdeps/unix/sysv/linux/futimes.c b/sysdeps/unix/sysv/linux/futimes.c
index 610f1deb29..272b83eb05 100644
--- a/sysdeps/unix/sysv/linux/futimes.c
+++ b/sysdeps/unix/sysv/linux/futimes.c
@@ -1,5 +1,5 @@
/* futimes -- change access and modification times of open file. Linux version.
- Copyright (C) 2002,2003,2005,2006 Free Software Foundation, Inc.
+ Copyright (C) 2002,2003,2005,2006,2007 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
@@ -29,7 +29,7 @@
#include <kernel-features.h>
-#ifndef __ASSUME_UTIMENSAT
+#if defined __NR_utimensat && !defined __ASSUME_UTIMENSAT
static int miss_utimensat;
#endif