From 673558beaa96378d2fe0cdd2c57e423e9f1611ab Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 20 Sep 2013 10:21:20 +0300 Subject: [PATCH] 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 --- nt/ChangeLog | 9 +++++++++ nt/mingw-cfg.site | 3 +++ 2 files changed, 12 insertions(+) diff --git a/nt/ChangeLog b/nt/ChangeLog index e7d9ed99e3c..2f9a2f5608d 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,12 @@ +2013-09-20 Eli Zaretskii + + * 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 + 2013-08-31 Glenn Morris * 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 @@ # We want to use getopt.h from gnulib ac_cv_header_getopt_h=no +# We don't want our struct timeval replaced due to Posix conformance +gl_cv_sys_struct_timeval_tv_sec=yes + # ACL functions are implemented in w32.c ac_cv_search_acl_get_file="none required" ac_cv_func_acl_get_file=yes -- 2.39.2