aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorFabrice Popineau2014-01-11 15:36:06 +0200
committerEli Zaretskii2014-01-11 15:36:06 +0200
commite05d3a05bfe8bb14e6f9246d76c7c9134eb101a1 (patch)
treea464c39b791b8b8beb9dc1d61730bbd91754aa33 /nt
parentaf05bef2d1985fb9bd8485f3084f3bfe282a911f (diff)
downloademacs-e05d3a05bfe8bb14e6f9246d76c7c9134eb101a1.tar.gz
emacs-e05d3a05bfe8bb14e6f9246d76c7c9134eb101a1.zip
Fix minor build problems related to MinGW64.
configure.ac: Read $srcdir/nt/mingw-cfg.site when $MSYSTEM is "MINGW64" as well. nt/inc/ms-w32.h (pthread_sigmask): Undefine if defined, for MinGW64. src/unexw32.c (_start) [__MINGW64__]: Define to __start.
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/inc/ms-w32.h5
2 files changed, 9 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 52582532fb3..551b973b016 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
12014-01-11 Fabrice Popineau <fabrice.popineau@supelec.fr>
2
3 * inc/ms-w32.h (pthread_sigmask): Undefine if defined, for MinGW64.
4
12013-12-31 Fabrice Popineau <fabrice.popineau@supelec.fr> 52013-12-31 Fabrice Popineau <fabrice.popineau@supelec.fr>
2 6
3 * inc/ms-w32.h (sys_kill): Fix prototype. 7 * inc/ms-w32.h (sys_kill): Fix prototype.
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index 7f523cb74f9..dca3476b2b6 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -388,6 +388,11 @@ extern int sigemptyset (sigset_t *);
388extern int sigaddset (sigset_t *, int); 388extern int sigaddset (sigset_t *, int);
389extern int sigfillset (sigset_t *); 389extern int sigfillset (sigset_t *);
390extern int sigprocmask (int, const sigset_t *, sigset_t *); 390extern int sigprocmask (int, const sigset_t *, sigset_t *);
391/* MinGW64 defines pthread_sigmask as zero in its pthread_signal.h
392 header, but we have an implementation for that function in w32proc.c. */
393#ifdef pthread_sigmask
394#undef pthread_sigmask
395#endif
391extern int pthread_sigmask (int, const sigset_t *, sigset_t *); 396extern int pthread_sigmask (int, const sigset_t *, sigset_t *);
392extern int sigismember (const sigset_t *, int); 397extern int sigismember (const sigset_t *, int);
393extern int setpgrp (int, int); 398extern int setpgrp (int, int);