diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/unix/common/bits/dirent.h | 32 | ||||
| -rw-r--r-- | sysdeps/unix/common/bits/fcntl.h | 119 |
3 files changed, 3 insertions, 151 deletions
diff --git a/ChangeLog b/ChangeLog index f66e44a5f2..1cfe280ae2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-05-04 Joseph Myers <joseph@codesourcery.com> + * sysdeps/unix/common/bits/dirent.h: Remove file. + * sysdeps/unix/common/bits/fcntl.h: Likewise. + * sysdeps/unix/bsd/bits/dirent.h: Remove file. * sysdeps/unix/bsd/bits/fcntl.h: Likewise. * sysdeps/unix/bsd/bsd4.4/isatty.c: Likewise. diff --git a/sysdeps/unix/common/bits/dirent.h b/sysdeps/unix/common/bits/dirent.h deleted file mode 100644 index 8be701d3dc..0000000000 --- a/sysdeps/unix/common/bits/dirent.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Directory entry structure `struct dirent'. SVR4 version. - Copyright (C) 1996, 1997 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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#ifndef _DIRENT_H -# error "Never use <bits/dirent.h> directly; include <dirent.h> instead." -#endif - -struct dirent - { - unsigned int d_fileno; - int d_off; /* Position in directory of following entry. */ - unsigned short int d_reclen; - char d_name[1]; /* Variable length. */ - }; - -#define _DIRENT_HAVE_D_RECLEN 1 -#define _DIRENT_HAVE_D_OFF 1 diff --git a/sysdeps/unix/common/bits/fcntl.h b/sysdeps/unix/common/bits/fcntl.h deleted file mode 100644 index 8b77444c04..0000000000 --- a/sysdeps/unix/common/bits/fcntl.h +++ /dev/null @@ -1,119 +0,0 @@ -/* O_*, F_*, FD_* bit values for general Unix system. - Copyright (C) 1991, 1992, 1995, 1997, 2000, 2004 - 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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#ifndef _FCNTL_H -# error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead." -#endif - - -/* File access modes for `open' and `fcntl'. */ -#define O_RDONLY 0 /* Open read-only. */ -#define O_WRONLY 1 /* Open write-only. */ -#define O_RDWR 2 /* Open read/write. */ - - -/* Bits OR'd into the second argument to open. */ -#define O_CREAT 0x0100 /* Create file if it doesn't exist. */ -#define O_EXCL 0x0400 /* Fail if file already exists. */ -#define O_TRUNC 0x0200 /* Truncate file to zero length. */ -#define O_NOCTTY 0x0800 /* Don't assign a controlling terminal. */ -#ifdef __USE_MISC -# define O_ASYNC 0x0040 /* Send SIGIO to owner when data is ready. */ -# define O_FSYNC 0x0010 /* Synchronous writes. */ -# define O_SYNC O_FSYNC -#endif - -/* File status flags for `open' and `fcntl'. */ -#define O_APPEND 0x0008 /* Writes append to the file. */ -#define O_NONBLOCK 0x0080 /* Non-blocking I/O. */ - -#ifdef __USE_MISC -# define O_NDELAY 0x0004 -#endif - -#ifdef __USE_MISC -/* Bits in the file status flags returned by F_GETFL. - These are all the O_* flags, plus FREAD and FWRITE, which are - independent bits set by which of O_RDONLY, O_WRONLY, and O_RDWR, was - given to `open'. */ -# define FREAD 1 -# define FWRITE 2 - -/* Traditional Unix names the O_* bits. */ -# define FASYNC O_ASYNC -# define FCREAT O_CREAT -# define FEXCL O_EXCL -# define FTRUNC O_TRUNC -# define FNOCTTY O_NOCTTY -# define FFSYNC O_FSYNC -# define FSYNC O_SYNC -# define FAPPEND O_APPEND -# define FNONBLOCK O_NONBLOCK -# define FNONBIO O_NONBLOCK -# define FNDELAY O_NDELAY -#endif - -/* Mask for file access modes. This is system-dependent in case - some system ever wants to define some other flavor of access. */ -#define O_ACCMODE (O_RDONLY|O_WRONLY|O_RDWR) - -/* Values for the second argument to `fcntl'. */ -#define F_DUPFD 0 /* Duplicate file descriptor. */ -#define F_GETFD 1 /* Get file descriptor flags. */ -#define F_SETFD 2 /* Set file descriptor flags. */ -#define F_GETFL 3 /* Get file status flags. */ -#define F_SETFL 4 /* Set file status flags. */ -#if defined __USE_BSD || defined __USE_UNIX98 -# define F_GETOWN 23 /* Get owner (receiver of SIGIO). */ -# define F_SETOWN 24 /* Set owner (receiver of SIGIO). */ -#endif -#define F_GETLK 14 /* Get record locking info. */ -#define F_SETLK 6 /* Set record locking info (non-blocking). */ -#define F_SETLKW 7 /* Set record locking info (blocking). */ -#ifdef __USE_SVID -# define F_ALLOCSP 10 /* Allocate space in the file. */ -# define F_FREESP 11 /* Free space in the file. */ -# define F_RGETLK 20 /* Get remote record locking info. */ -# define F_RSETLK 21 /* Set remote locking info (non-blocking). */ -# define F_RSETLKW 22 /* Set remote locking info (blocking). */ -#endif - -/* File descriptor flags used with F_GETFD and F_SETFD. */ -#define FD_CLOEXEC 1 /* Close on exec. */ - - -#include <bits/types.h> - -/* The structure describing an advisory lock. This is the type of the third - argument to `fcntl' for the F_GETLK, F_SETLK, and F_SETLKW requests. */ -struct flock - { - short int l_type; /* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. */ - short int l_whence; /* Where `l_start' is relative to (like `lseek'). */ - __off_t l_start; /* Offset where the lock begins. */ - __off_t l_len; /* Size of the locked area; zero means until EOF. */ - long int l_sysid; /* System ID where locking process resides. */ - __pid_t l_pid; /* Process holding the lock. */ - long int pad[4]; /* Reserved for future use. */ - }; - -/* Values for the `l_type' field of a `struct flock'. */ -#define F_RDLCK 1 /* Read lock. */ -#define F_WRLCK 2 /* Write lock. */ -#define F_UNLCK 3 /* Remove lock. */ |