aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Love2000-12-21 00:01:55 +0000
committerDave Love2000-12-21 00:01:55 +0000
commit774ba8c93df98b56fd1f6e788e3ac0e4a8c2266a (patch)
tree54a088310074560942df3942ec9de93ffcf4b03b /src
parent88416888aa98b7d77f0176a6156d5411b0ccd50b (diff)
downloademacs-774ba8c93df98b56fd1f6e788e3ac0e4a8c2266a.tar.gz
emacs-774ba8c93df98b56fd1f6e788e3ac0e4a8c2266a.zip
(NSIG): Don't redefine.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/s/osf5-0.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9fa435c8d9e..4076f954216 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12000-12-20 Dave Love <fx@gnu.org>
2
3 * s/osf5-0.h (NSIG): Don't redefine.
4
12000-12-20 Stefan Monnier <monnier@cs.yale.edu> 52000-12-20 Stefan Monnier <monnier@cs.yale.edu>
2 6
3 * keymap.c (where_is_internal): Check ascii_sequence_p rather than 7 * keymap.c (where_is_internal): Check ascii_sequence_p rather than
diff --git a/src/s/osf5-0.h b/src/s/osf5-0.h
index 1e490c5a998..b084ab8c887 100644
--- a/src/s/osf5-0.h
+++ b/src/s/osf5-0.h
@@ -8,7 +8,9 @@
8#define WAIT_USE_INT 8#define WAIT_USE_INT
9#define SYS_SIGLIST_DECLARED 9#define SYS_SIGLIST_DECLARED
10#define sys_siglist __sys_siglist 10#define sys_siglist __sys_siglist
11#ifndef NSIG /* _OSF_SOURCE seems to get us this */
11#define NSIG __sys_nsig 12#define NSIG __sys_nsig
13#endif
12 14
13/* We have missing/inconsistent prototypes on 5.0, at least. */ 15/* We have missing/inconsistent prototypes on 5.0, at least. */
14#define INHIBIT_X11R6_XIM 16#define INHIBIT_X11R6_XIM