diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-04-01 19:43:08 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-04-01 19:43:08 +0000 |
| commit | c46d4a9b60ba79c321ab9075f71751389808a15a (patch) | |
| tree | 604d02100f0216b1684cfb7f51d46663b25b10d3 /libc/io | |
| parent | 5c8cf8f50bb4598c4ecf2aa860aa7bf0ef0c3df7 (diff) | |
Merge changes between r13227 and r13354 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@13355 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/io')
| -rw-r--r-- | libc/io/Makefile | 5 | ||||
| -rw-r--r-- | libc/io/fcntl.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libc/io/Makefile b/libc/io/Makefile index c8a317922..fb97a1ed9 100644 --- a/libc/io/Makefile +++ b/libc/io/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1992-2003,2005,2006,2007,2008 Free Software Foundation, Inc. +# Copyright (C) 1992-2003,2005-2008,2011 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 @@ -96,6 +96,9 @@ CFLAGS-ftw64.c = $(uses-callbacks) -fexceptions CFLAGS-lockf.c = -fexceptions CFLAGS-posix_fallocate.c = -fexceptions CFLAGS-posix_fallocate64.c = -fexceptions +CFLAGS-fallocate.c = -fexceptions +CFLAGS-fallocate64.c = -fexceptions +CFLAGS-sync_file_range.c = -fexceptions CFLAGS-test-stat.c = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CFLAGS-test-lfs.c = -D_LARGEFILE64_SOURCE diff --git a/libc/io/fcntl.h b/libc/io/fcntl.h index 0b6b047b4..c582a9e6f 100644 --- a/libc/io/fcntl.h +++ b/libc/io/fcntl.h @@ -112,6 +112,7 @@ __BEGIN_DECLS # define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */ # define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount traversal. */ +# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */ # define AT_EACCESS 0x200 /* Test access permitted for effective IDs, not real IDs. */ #endif @@ -241,7 +242,7 @@ extern int posix_fadvise64 (int __fd, __off64_t __offset, __off64_t __len, /* Reserve storage for the data of the file associated with FD. - This function is a possible cancellation points and therefore not + This function is a possible cancellation point and therefore not marked with __THROW. */ # ifndef __USE_FILE_OFFSET64 extern int posix_fallocate (int __fd, __off_t __offset, __off_t __len); |