summaryrefslogtreecommitdiff
path: root/libc/sysdeps/unix/sysv/linux/futimes.c
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2007-06-04 20:34:58 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2007-06-04 20:34:58 +0000
commite84299663ca4d679999ef6bc7a430c354356b3f3 (patch)
tree5ccbe918b5d6dfc549e7286f2a5557cea7aea63b /libc/sysdeps/unix/sysv/linux/futimes.c
parent0ef72d52eaacd3fbfb4f08adbdf240f8e0aa6c56 (diff)
Merge changes between r2277 and r2393 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@2394 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix/sysv/linux/futimes.c')
-rw-r--r--libc/sysdeps/unix/sysv/linux/futimes.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/sysdeps/unix/sysv/linux/futimes.c b/libc/sysdeps/unix/sysv/linux/futimes.c
index 610f1deb2..272b83eb0 100644
--- a/libc/sysdeps/unix/sysv/linux/futimes.c
+++ b/libc/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