aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2005-09-10 14:32:20 +0000
committerEli Zaretskii2005-09-10 14:32:20 +0000
commitb04a31209bb47897a42c33d7280e42d851f26b22 (patch)
tree8e4c2ad61cd175a5678d6ad42c31c068a3852ae7 /src
parent2412f586752c9fe9b8392a3c33a1b8ca0ea1c533 (diff)
downloademacs-b04a31209bb47897a42c33d7280e42d851f26b22.tar.gz
emacs-b04a31209bb47897a42c33d7280e42d851f26b22.zip
Don't #undef NULL after including blockinput.h.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/sysdep.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 18cdcde2719..a4b2ae24ef7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -10,6 +10,7 @@
10 prototype. 10 prototype.
11 11
12 * sysdep.c [WINDOWSNT]: Add prototype for getwd. 12 * sysdep.c [WINDOWSNT]: Add prototype for getwd.
13 Don't #undef NULL after including blockinput.h.
13 14
14 * config.in: Regenerated. 15 * config.in: Regenerated.
15 16
diff --git a/src/sysdep.c b/src/sysdep.c
index ad043c023a2..c0ff47e3072 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -47,7 +47,6 @@ extern void srandom P_ ((unsigned int));
47#endif 47#endif
48 48
49#include "blockinput.h" 49#include "blockinput.h"
50#undef NULL
51 50
52#ifdef MAC_OS8 51#ifdef MAC_OS8
53/* It is essential to include stdlib.h so that this file picks up 52/* It is essential to include stdlib.h so that this file picks up