qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update M68K bits/fcntl.h for XPG7 and allow bits/stat.h inclusion from fcntl.h.

This commit is contained in:
Joseph Myers 2010-01-10 19:02:51 +00:00
parent 60a0880e36
commit 2f12146a33
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog.m68k
View File

@ -1,3 +1,11 @@
2010-01-10 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/m68k/bits/fcntl.h: Define O_DIRECTORY,
O_NOFOLLOW, O_CLOEXEC, F_DUPFD_CLOEXEC, F_SETOWN, and F_GETOWN for
XPG7.
* sysdeps/unix/sysv/linux/m68k/bits/stat.h: Enable using from
fcntl.h.
2009-12-16 Joseph Myers <joseph@codesourcery.com> 2009-12-16 Joseph Myers <joseph@codesourcery.com>
[BZ #11093] [BZ #11093]

12
sysdeps/unix/sysv/linux/m68k/bits/fcntl.h
View File

@ -1,5 +1,5 @@
/* O_*, F_*, FD_* bit values for Linux. /* O_*, F_*, FD_* bit values for Linux.
Copyright (C) 2000, 2004, 2008, 2009 Free Software Foundation, Inc. Copyright (C) 2000, 2004, 2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -44,12 +44,14 @@
#define O_FSYNC O_SYNC #define O_FSYNC O_SYNC
#define O_ASYNC 020000 #define O_ASYNC 020000
#ifdef __USE_GNU #ifdef __USE_XOPEN2K8
# define O_DIRECTORY 040000 /* Must be a directory. */ # define O_DIRECTORY 040000 /* Must be a directory. */
# define O_NOFOLLOW 0100000 /* Do not follow links. */ # define O_NOFOLLOW 0100000 /* Do not follow links. */
# define O_CLOEXEC 02000000 /* Set close_on_exec. */
#endif
#ifdef __USE_GNU
# define O_DIRECT 0200000 /* Direct disk access. */ # define O_DIRECT 0200000 /* Direct disk access. */
# define O_NOATIME 01000000 /* Do not set atime. */ # define O_NOATIME 01000000 /* Do not set atime. */
# define O_CLOEXEC 02000000 /* Set close_on_exec. */
#endif #endif
/* For now Linux has synchronisity options for data and read operations. /* For now Linux has synchronisity options for data and read operations.
@ -83,7 +85,7 @@
#define F_SETLK64 13 /* Set record locking info (non-blocking). */ #define F_SETLK64 13 /* Set record locking info (non-blocking). */
#define F_SETLKW64 14 /* Set record locking info (blocking). */ #define F_SETLKW64 14 /* Set record locking info (blocking). */
#if defined __USE_BSD || defined __USE_UNIX98 #if defined __USE_BSD || defined __USE_UNIX98 || defined __USE_XOPEN2K8
# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ # define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */
# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ # define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */
#endif #endif
@ -99,6 +101,8 @@
# define F_SETLEASE 1024 /* Set a lease. */ # define F_SETLEASE 1024 /* Set a lease. */
# define F_GETLEASE 1025 /* Enquire what lease is active. */ # define F_GETLEASE 1025 /* Enquire what lease is active. */
# define F_NOTIFY 1026 /* Request notfications on a directory. */ # define F_NOTIFY 1026 /* Request notfications on a directory. */
#endif
#ifdef __USE_XOPEN2K8
# define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with # define F_DUPFD_CLOEXEC 1030 /* Duplicate file descriptor with
close-on-exit set. */ close-on-exit set. */
#endif #endif

4
sysdeps/unix/sysv/linux/m68k/bits/stat.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1992,95,96,97,98,99,2000,2001,2002,2008,2009 /* Copyright (C) 1992,95,96,97,98,99,2000,2001,2002,2008,2009,2010
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -17,7 +17,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
#ifndef _SYS_STAT_H #if !defined _SYS_STAT_H && !defined _FCNTL_H
# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead." # error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
#endif #endif