diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-05-04 13:05:31 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-05-04 13:06:00 -0700 |
| commit | 0918b47b06be41b037be7826c5de04d559026d3e (patch) | |
| tree | d1ddcc348cc8cd31f872d08298a05769b602a62b /m4 | |
| parent | 639607db00b96f33b0e18afa27188456c6ccad0a (diff) | |
| download | gnulib-0918b47b06be41b037be7826c5de04d559026d3e.tar.gz | |
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.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/off_t.m4 | 17 | ||||
| -rw-r--r-- | m4/sys_types_h.m4 | 9 | ||||
| -rw-r--r-- | m4/unistd_h.m4 | 6 |
3 files changed, 22 insertions, 10 deletions
diff --git a/m4/off_t.m4 b/m4/off_t.m4 new file mode 100644 index 0000000000..207b94647f --- /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]) +]) diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 index a14ba24470..f11eef2fe8 100644 --- 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_DEFUN([gl_SYS_TYPES_H], 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], diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index d636caf112..8b7830da3e 100644 --- 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 @@ AC_DEFUN([gl_UNISTD_H], 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. |