projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from texinfo
[gnulib.git]
/
lib
/
fcntl.in.h
diff --git
a/lib/fcntl.in.h
b/lib/fcntl.in.h
index
acf9de3
..
fd7520e
100644
(file)
--- a/
lib/fcntl.in.h
+++ b/
lib/fcntl.in.h
@@
-1,11
+1,11
@@
/* Like <fcntl.h>, but with non-working flags defined to 0.
/* Like <fcntl.h>, but with non-working flags defined to 0.
- Copyright (C) 2006-200
7
Free Software Foundation, Inc.
+ Copyright (C) 2006-200
8
Free Software Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ This program is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,11
+13,25
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* written by Paul Eggert */
/* written by Paul Eggert */
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+
+#if defined __need_system_fcntl_h
+/* Special invocation convention. */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#@INCLUDE_NEXT@ @NEXT_FCNTL_H@
+
+#else
+/* Normal invocation convention. */
+
#ifndef _GL_FCNTL_H
#include <sys/types.h>
#ifndef _GL_FCNTL_H
#include <sys/types.h>
@@
-36,9
+50,17
@@
extern "C" {
#endif
extern "C" {
#endif
-#if (@GNULIB_OPEN@ && @REPLACE_OPEN@) || defined FCHDIR_REPLACEMENT
-# define open rpl_open
+#if @GNULIB_OPEN@
+# if @REPLACE_OPEN@
+# undef open
+# define open rpl_open
extern int open (const char *filename, int flags, ...);
extern int open (const char *filename, int flags, ...);
+# endif
+#endif
+
+#ifdef FCHDIR_REPLACEMENT
+/* gnulib internal function. */
+extern void _gl_register_fd (int fd, const char *filename);
#endif
#ifdef __cplusplus
#endif
#ifdef __cplusplus
@@
-105,8
+127,8
@@
extern int open (const char *filename, int flags, ...);
# define O_TEXT _O_TEXT
#endif
# define O_TEXT _O_TEXT
#endif
-#if
def __BEOS
__
- /* BeOS 5
has
O_BINARY and O_TEXT, but they have no effect. */
+#if
defined __BEOS__ || defined __HAIKU
__
+ /* BeOS 5
and Haiku have
O_BINARY and O_TEXT, but they have no effect. */
# undef O_BINARY
# undef O_TEXT
#endif
# undef O_BINARY
# undef O_TEXT
#endif
@@
-119,3
+141,4
@@
extern int open (const char *filename, int flags, ...);
#endif /* _GL_FCNTL_H */
#endif /* _GL_FCNTL_H */
#endif /* _GL_FCNTL_H */
#endif /* _GL_FCNTL_H */
+#endif