diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2010-10-03 09:21:55 -0700 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2010-10-03 09:21:55 -0700 |
| commit | b5437a05eceec0f37a2d4544a0945a1cc159f00c (patch) | |
| tree | 728fd842254c6555cfa55600858c13c652dd5b5b /src | |
| parent | 178fdd41ca72858d3ec8a5e780896964cc2997a2 (diff) | |
| download | emacs-b5437a05eceec0f37a2d4544a0945a1cc159f00c.tar.gz | |
* src/termhooks.h: Remove #ifdef CONSP.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/termhooks.h | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0ed868b7d3a..6ab8470dd96 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2010-10-03 Dan Nicolaescu <dann@ics.uci.edu> + * termhooks.h: Remove #ifdef CONSP. + * xterm.c (NO_INLINE, noinline): Move definitions to ../configure.in. Include <fcntl.h> unconditionally. diff --git a/src/termhooks.h b/src/termhooks.h index b16c36f9551..b9358896bae 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -44,11 +44,6 @@ extern void (*fullscreen_hook) (struct frame *f); /* Input queue declarations and hooks. */ -/* Expedient hack: only provide the below definitions to files that - are prepared to handle lispy things. CONSP is defined if lisp.h - has been included before this file. */ -#ifdef CONSP - enum event_kind { NO_EVENT, /* nothing happened. This should never @@ -317,8 +312,6 @@ extern void term_mouse_moveto (int, int); extern struct tty_display_info *gpm_tty; #endif -#endif /* CONSP */ - struct ns_display_info; struct x_display_info; |