diff options
| author | Eli Zaretskii | 2013-09-20 10:21:20 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-09-20 10:21:20 +0300 |
| commit | 673558beaa96378d2fe0cdd2c57e423e9f1611ab (patch) | |
| tree | 58556ddc3b29c30d67993bb08a4e0828fc6875d0 | |
| parent | 485a4a6e8ac6b766f25ea42bf348c33b01646b20 (diff) | |
| download | emacs-673558beaa96378d2fe0cdd2c57e423e9f1611ab.tar.gz emacs-673558beaa96378d2fe0cdd2c57e423e9f1611ab.zip | |
Avoid replacing 'struct timeval' and compiling lib/gettimeofday.c on MinGW.
nt/mingw-cfg.site (gl_cv_sys_struct_timeval_tv_sec): Set to "yes"
to avoid gnulib replacement of 'struct timeval' and the resulting
compilation of lib/gettimeofday.c with incompatible version of
gettimeofday. Related discussions on emacs-devel:
http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00286.html
http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00361.html
| -rw-r--r-- | nt/ChangeLog | 9 | ||||
| -rw-r--r-- | nt/mingw-cfg.site | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index e7d9ed99e3c..2f9a2f5608d 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2013-09-20 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * mingw-cfg.site (gl_cv_sys_struct_timeval_tv_sec): Set to "yes" | ||
| 4 | to avoid gnulib replacement of 'struct timeval' and the resulting | ||
| 5 | compilation of lib/gettimeofday.c with incompatible version of | ||
| 6 | gettimeofday. Related discussions on emacs-devel: | ||
| 7 | http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00286.html | ||
| 8 | http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00361.html | ||
| 9 | |||
| 1 | 2013-08-31 Glenn Morris <rgm@gnu.org> | 10 | 2013-08-31 Glenn Morris <rgm@gnu.org> |
| 2 | 11 | ||
| 3 | * INSTALL: Rename from INSTALL.MSYS. | 12 | * INSTALL: Rename from INSTALL.MSYS. |
diff --git a/nt/mingw-cfg.site b/nt/mingw-cfg.site index 325bba29ae5..a217cbc8c70 100644 --- a/nt/mingw-cfg.site +++ b/nt/mingw-cfg.site | |||
| @@ -31,6 +31,9 @@ | |||
| 31 | # We want to use getopt.h from gnulib | 31 | # We want to use getopt.h from gnulib |
| 32 | ac_cv_header_getopt_h=no | 32 | ac_cv_header_getopt_h=no |
| 33 | 33 | ||
| 34 | # We don't want our struct timeval replaced due to Posix conformance | ||
| 35 | gl_cv_sys_struct_timeval_tv_sec=yes | ||
| 36 | |||
| 34 | # ACL functions are implemented in w32.c | 37 | # ACL functions are implemented in w32.c |
| 35 | ac_cv_search_acl_get_file="none required" | 38 | ac_cv_search_acl_get_file="none required" |
| 36 | ac_cv_func_acl_get_file=yes | 39 | ac_cv_func_acl_get_file=yes |