Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16817:7747cb9b54b9
unistd_h: make it easier to avoid sys_types_h
This is useful for Emacs, which has its own method of porting to
Windows, and which therefore does not need the sys_types_h module.
* m4/off_t.m4: New file, defining gl_TYPE_OFF_T, which contains
code moved here from gl_SYS_TYPES_H.
* m4/sys_types_h.m4 (gl_SYS_TYPES_H): Require it instead of
using the code directly.
* m4/unistd_h.m4 (gl_UNISTD_H): Require gl_TYPE_OFF_T, not
gl_SYS_TYPES_H.
* modules/sys_types (Files):
* modules/unistd (Files): Add m4/off_t.m4.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Fri, 04 May 2012 13:05:31 -0700 |
| parents | 7fd7a96c8845 |
| children | 1bd1aabc2dac |
| files | ChangeLog m4/off_t.m4 m4/sys_types_h.m4 m4/unistd_h.m4 modules/sys_types modules/unistd |
| diffstat | 6 files changed, 38 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2012-05-04 Paul Eggert <eggert@cs.ucla.edu> + + unistd_h: make it easier to avoid sys_types_h + This is useful for Emacs, which has its own method of porting to + Windows, and which therefore does not need the sys_types_h module. + * m4/off_t.m4: New file, defining gl_TYPE_OFF_T, which contains + code moved here from gl_SYS_TYPES_H. + * m4/sys_types_h.m4 (gl_SYS_TYPES_H): Require it instead of + using the code directly. + * m4/unistd_h.m4 (gl_UNISTD_H): Require gl_TYPE_OFF_T, not + gl_SYS_TYPES_H. + * modules/sys_types (Files): + * modules/unistd (Files): Add m4/off_t.m4. + 2012-05-03 Bruno Haible <bruno@clisp.org> lstat: Avoid "guessing no" when cross-compiling to glibc systems.
new file mode 100644 --- /dev/null +++ b/m4/off_t.m4 @@ -0,0 +1,17 @@ +# off_t.m4 +dnl Copyright (C) 2012 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl Check whether to override the 'off_t' type. + +AC_DEFUN([gl_TYPE_OFF_T], +[ + m4_ifdef([gl_LARGEFILE], [ + AC_REQUIRE([gl_LARGEFILE]) + ], [ + WINDOWS_64_BIT_OFF_T=0 + ]) + AC_SUBST([WINDOWS_64_BIT_OFF_T]) +])
--- a/m4/sys_types_h.m4 +++ b/m4/sys_types_h.m4 @@ -1,4 +1,4 @@ -# sys_types_h.m4 serial 3 +# sys_types_h.m4 serial 4 dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,12 +16,7 @@ AC_REQUIRE([AC_TYPE_MODE_T]) dnl Whether to override the 'off_t' type. - m4_ifdef([gl_LARGEFILE], [ - AC_REQUIRE([gl_LARGEFILE]) - ], [ - WINDOWS_64_BIT_OFF_T=0 - ]) - AC_SUBST([WINDOWS_64_BIT_OFF_T]) + AC_REQUIRE([gl_TYPE_OFF_T]) ]) AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
--- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,4 +1,4 @@ -# unistd_h.m4 serial 64 +# unistd_h.m4 serial 65 dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -24,8 +24,8 @@ dnl Ensure the type pid_t gets defined. AC_REQUIRE([AC_TYPE_PID_T]) - dnl Determine WINDOWS_64_BIT_OFF_T. - AC_REQUIRE([gl_SYS_TYPES_H]) + dnl Whether to override the 'off_t' type. + AC_REQUIRE([gl_TYPE_OFF_T]) dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use.