procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More MinGW64 fixes.

Browse source 
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'.
This commit is contained in:
Eli Zaretskii 2013-03-26 16:04:07 +02:00
parent da9dcbb87f
commit 8f5e14c849
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -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.

2
src/w32.c
View file

@ -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 */