Commit 8f5e14c8 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

More MinGW64 fixes.

 src/w32.c Move inclusion of time.h before sys/time.h, so that MinGW64 could
 see its own definitions of 'struct timeval' and 'struct timezone'.
parent da9dcbb8
......@@ -4,6 +4,8 @@
Define only for _WIN32_WINNT less than 0x0500.
(_ANONYMOUS_UNION, _ANONYMOUS_STRUCT) [!_W64]: Don't define for
MinGW64.
Move inclusion of time.h before sys/time.h, so that MinGW64 could
see its own definitions of 'struct timeval' and 'struct timezone'.
Fix incompatibilities between MinGW.org and MinGW64 headers.
* w32term.c (WCRANGE, GLYPHSET): Don't define if _W64 is defined.
......
......@@ -29,10 +29,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <ctype.h>
#include <signal.h>
#include <sys/file.h>
#include <time.h> /* must be before nt/inc/sys/time.h, for MinGW64 */
#include <sys/time.h>
#include <sys/utime.h>
#include <math.h>
#include <time.h>
/* must include CRT headers *before* config.h */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment