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
/
sys_file.in.h
diff --git
a/lib/sys_file.in.h
b/lib/sys_file.in.h
index
58e0d6a
..
9ace671
100644
(file)
--- a/
lib/sys_file.in.h
+++ b/
lib/sys_file.in.h
@@
-17,16
+17,17
@@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Written by Richard W.M. Jones. */
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Written by Richard W.M. Jones. */
+
#ifndef _GL_SYS_FILE_H
#ifndef _GL_SYS_FILE_H
-#
if __GNUC__ >= 3
+#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
@PRAGMA_SYSTEM_HEADER@
-#
endif
+#endif
/* The include_next requires a split double-inclusion guard. */
/* The include_next requires a split double-inclusion guard. */
-#
if @HAVE_SYS_FILE_H@
-#
@INCLUDE_NEXT@ @NEXT_SYS_FILE_H@
-#
endif
+#if @HAVE_SYS_FILE_H@
+# @INCLUDE_NEXT@ @NEXT_SYS_FILE_H@
+#endif
#ifndef _GL_SYS_FILE_H
#define _GL_SYS_FILE_H
#ifndef _GL_SYS_FILE_H
#define _GL_SYS_FILE_H
@@
-41,7
+42,7
@@
# define LOCK_NB 4 /* Don't block when locking. */
#endif
# define LOCK_NB 4 /* Don't block when locking. */
#endif
-/* The definition of
GL_LINK_WARNING
is copied here. */
+/* The definition of
_GL_WARN_ON_USE
is copied here. */
#if @GNULIB_FLOCK@
/* Apply or remove advisory locks on an open file.
#if @GNULIB_FLOCK@
/* Apply or remove advisory locks on an open file.
@@
-51,10
+52,10
@@
extern int flock (int fd, int operation);
# endif
#elif defined GNULIB_POSIXCHECK
# undef flock
# endif
#elif defined GNULIB_POSIXCHECK
# undef flock
-#
define flock(fd,op) \
- (GL_LINK_WARNING ("flock is unportable - " \
- "use gnulib module flock for portability"), \
- flock ((fd), (op)))
+#
if HAVE_RAW_DECL_FLOCK
+_GL_WARN_ON_USE (flock, "flock is unportable - "
+ "use gnulib module flock for portability");
+# endif
#endif
#endif