aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney2007-10-22 22:42:54 +0000
committerJason Rumney2007-10-22 22:42:54 +0000
commitc8f7c76b847e85f651a2fa91a567dfd661050a82 (patch)
tree21a2372f7bc6ff4d795c84be40ad15c6cbbba239 /src
parent5eaf5ed9f51a2b709bdee56ac7b79445ec023abf (diff)
downloademacs-c8f7c76b847e85f651a2fa91a567dfd661050a82.tar.gz
emacs-c8f7c76b847e85f651a2fa91a567dfd661050a82.zip
(HAVE_STDLIB_H): Define.
(abort): Redefinition moved to nt/config.nt.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/s/ms-w32.h5
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 30eaea0a3df..d1653783619 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12007-10-22 Jason Rumney <jasonr@gnu.org> 12007-10-22 Jason Rumney <jasonr@gnu.org>
2 2
3 * s/ms-w32.h (HAVE_STDLIB_H): Define.
4 (abort): Redefinition moved to nt/config.nt.
5
3 * m/windowsnt.h: Remove. 6 * m/windowsnt.h: Remove.
4 7
52007-10-22 Juanma Barranquero <lekktu@gmail.com> 82007-10-22 Juanma Barranquero <lekktu@gmail.com>
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 5a297a4ee80..56a09f9b315 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -241,6 +241,7 @@ Boston, MA 02110-1301, USA. */
241#undef HAVE_TERMIOS_H 241#undef HAVE_TERMIOS_H
242#define HAVE_LIMITS_H 1 242#define HAVE_LIMITS_H 1
243#define HAVE_STRING_H 1 243#define HAVE_STRING_H 1
244#define HAVE_STDLIB_H 1
244#define HAVE_PWD_H 1 245#define HAVE_PWD_H 1
245#define STDC_HEADERS 1 246#define STDC_HEADERS 1
246#define TIME_WITH_SYS_TIME 1 247#define TIME_WITH_SYS_TIME 1
@@ -401,10 +402,6 @@ typedef int pid_t;
401#define utime _utime 402#define utime _utime
402#endif 403#endif
403 404
404#ifdef HAVE_NTGUI
405#define abort w32_abort
406#endif
407
408/* this is hacky, but is necessary to avoid warnings about macro 405/* this is hacky, but is necessary to avoid warnings about macro
409 redefinitions using the SDK compilers */ 406 redefinitions using the SDK compilers */
410#ifndef __STDC__ 407#ifndef __STDC__