Mercurial > hg > octave-nkf > gnulib-hg
comparison lib/fcntl.in.h @ 14840:5f709022a256
Allow multiple gnulib generated include files to be combined.
* gnulib-tool (func_compute_include_guard_prefix): New function.
(func_emit_lib_Makefile_am, func_emit_tests_Makefile_am): Resolve also
${gl_include_guard_prefix} references.
(func_import, func_create_testdir): Invoke
func_compute_include_guard_prefix.
* lib/arpa_inet.in.h: Use the @GUARD_PREFIX@ placeholder.
* lib/ctype.in.h: Likewise.
* lib/dirent.in.h: Likewise.
* lib/errno.in.h: Likewise.
* lib/fcntl.in.h: Likewise.
* lib/float.in.h: Likewise.
* lib/getopt.in.h: Likewise.
* lib/iconv.in.h: Likewise.
* lib/langinfo.in.h: Likewise.
* lib/locale.in.h: Likewise.
* lib/math.in.h: Likewise.
* lib/netdb.in.h: Likewise.
* lib/netinet_in.in.h: Likewise.
* lib/poll.in.h: Likewise.
* lib/pthread.in.h: Likewise.
* lib/pty.in.h: Likewise.
* lib/sched.in.h: Likewise.
* lib/se-selinux.in.h: Likewise.
* lib/search.in.h: Likewise.
* lib/signal.in.h: Likewise.
* lib/spawn.in.h: Likewise.
* lib/stdarg.in.h: Likewise.
* lib/stddef.in.h: Likewise.
* lib/stdint.in.h: Likewise.
* lib/stdio.in.h: Likewise.
* lib/stdlib.in.h: Likewise.
* lib/string.in.h: Likewise.
* lib/strings.in.h: Likewise.
* lib/sys_file.in.h: Likewise.
* lib/sys_ioctl.in.h: Likewise.
* lib/sys_select.in.h: Likewise.
* lib/sys_socket.in.h: Likewise.
* lib/sys_stat.in.h: Likewise.
* lib/sys_time.in.h: Likewise.
* lib/sys_times.in.h: Likewise.
* lib/sys_uio.in.h: Likewise.
* lib/sys_utsname.in.h: Likewise.
* lib/sys_wait.in.h: Likewise.
* lib/sysexits.in.h: Likewise.
* lib/termios.in.h: Likewise.
* lib/time.in.h: Likewise.
* lib/unistd.in.h: Likewise.
* lib/wchar.in.h: Likewise.
* lib/wctype.in.h: Likewise.
* modules/arpa_inet (Makefile.am): Substitute @GUARD_PREFIX@.
* modules/ctype (Makefile.am): Likewise.
* modules/dirent (Makefile.am): Likewise.
* modules/errno (Makefile.am): Likewise.
* modules/fcntl-h (Makefile.am): Likewise.
* modules/float (Makefile.am): Likewise.
* modules/getopt-posix (Makefile.am): Likewise.
* modules/iconv-h (Makefile.am): Likewise.
* modules/langinfo (Makefile.am): Likewise.
* modules/locale (Makefile.am): Likewise.
* modules/math (Makefile.am): Likewise.
* modules/netdb (Makefile.am): Likewise.
* modules/netinet_in (Makefile.am): Likewise.
* modules/poll-h (Makefile.am): Likewise.
* modules/pthread (Makefile.am): Likewise.
* modules/pty (Makefile.am): Likewise.
* modules/sched (Makefile.am): Likewise.
* modules/search (Makefile.am): Likewise.
* modules/selinux-h (Makefile.am): Likewise.
* modules/signal (Makefile.am): Likewise.
* modules/spawn (Makefile.am): Likewise.
* modules/stdarg (Makefile.am): Likewise.
* modules/stddef (Makefile.am): Likewise.
* modules/stdint (Makefile.am): Likewise.
* modules/stdio (Makefile.am): Likewise.
* modules/stdlib (Makefile.am): Likewise.
* modules/string (Makefile.am): Likewise.
* modules/strings (Makefile.am): Likewise.
* modules/sys_file (Makefile.am): Likewise.
* modules/sys_ioctl (Makefile.am): Likewise.
* modules/sys_select (Makefile.am): Likewise.
* modules/sys_socket (Makefile.am): Likewise.
* modules/sys_stat (Makefile.am): Likewise.
* modules/sys_time (Makefile.am): Likewise.
* modules/sys_times (Makefile.am): Likewise.
* modules/sys_uio (Makefile.am): Likewise.
* modules/sys_utsname (Makefile.am): Likewise.
* modules/sys_wait (Makefile.am): Likewise.
* modules/sysexits (Makefile.am): Likewise.
* modules/termios (Makefile.am): Likewise.
* modules/time (Makefile.am): Likewise.
* modules/unistd (Makefile.am): Likewise.
* modules/wchar (Makefile.am): Likewise.
* modules/wctype-h (Makefile.am): Likewise.
* modules/assert-h (Makefile.am): Replace _GL_VERIFY_H specially.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 29 May 2011 15:44:42 +0200 |
parents | a5714f0caebd |
children | 8250f2777afc |
comparison
equal
deleted
inserted
replaced
14839:984611ea5a25 | 14840:5f709022a256 |
---|---|
38 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ | 38 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ |
39 | 39 |
40 #else | 40 #else |
41 /* Normal invocation convention. */ | 41 /* Normal invocation convention. */ |
42 | 42 |
43 #ifndef _GL_FCNTL_H | 43 #ifndef _@GUARD_PREFIX@_FCNTL_H |
44 | 44 |
45 #include <sys/types.h> | 45 #include <sys/types.h> |
46 /* On some systems other than glibc, <sys/stat.h> is a prerequisite of | 46 /* On some systems other than glibc, <sys/stat.h> is a prerequisite of |
47 <fcntl.h>. On glibc systems, we would like to avoid namespace pollution. | 47 <fcntl.h>. On glibc systems, we would like to avoid namespace pollution. |
48 But on glibc systems, <fcntl.h> includes <sys/stat.h> inside an | 48 But on glibc systems, <fcntl.h> includes <sys/stat.h> inside an |
53 # include <sys/stat.h> | 53 # include <sys/stat.h> |
54 #endif | 54 #endif |
55 /* The include_next requires a split double-inclusion guard. */ | 55 /* The include_next requires a split double-inclusion guard. */ |
56 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ | 56 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ |
57 | 57 |
58 #ifndef _GL_FCNTL_H | 58 #ifndef _@GUARD_PREFIX@_FCNTL_H |
59 #define _GL_FCNTL_H | 59 #define _@GUARD_PREFIX@_FCNTL_H |
60 | 60 |
61 #ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems. */ | 61 #ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems. */ |
62 # include <unistd.h> | 62 # include <unistd.h> |
63 #endif | 63 #endif |
64 | 64 |
318 #ifndef AT_EACCESS | 318 #ifndef AT_EACCESS |
319 # define AT_EACCESS 4 | 319 # define AT_EACCESS 4 |
320 #endif | 320 #endif |
321 | 321 |
322 | 322 |
323 #endif /* _GL_FCNTL_H */ | 323 #endif /* _@GUARD_PREFIX@_FCNTL_H */ |
324 #endif /* _GL_FCNTL_H */ | 324 #endif /* _@GUARD_PREFIX@_FCNTL_H */ |
325 #endif | 325 #endif |