diff options
| author | Dan Nicolaescu | 2010-10-03 09:21:55 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-10-03 09:21:55 -0700 |
| commit | b5437a05eceec0f37a2d4544a0945a1cc159f00c (patch) | |
| tree | 728fd842254c6555cfa55600858c13c652dd5b5b /src | |
| parent | 178fdd41ca72858d3ec8a5e780896964cc2997a2 (diff) | |
| download | emacs-b5437a05eceec0f37a2d4544a0945a1cc159f00c.tar.gz emacs-b5437a05eceec0f37a2d4544a0945a1cc159f00c.zip | |
* 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 @@ | |||
| 1 | 2010-10-03 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2010-10-03 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * termhooks.h: Remove #ifdef CONSP. | ||
| 4 | |||
| 3 | * xterm.c (NO_INLINE, noinline): Move definitions to ../configure.in. | 5 | * xterm.c (NO_INLINE, noinline): Move definitions to ../configure.in. |
| 4 | 6 | ||
| 5 | Include <fcntl.h> unconditionally. | 7 | 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); | |||
| 44 | 44 | ||
| 45 | /* Input queue declarations and hooks. */ | 45 | /* Input queue declarations and hooks. */ |
| 46 | 46 | ||
| 47 | /* Expedient hack: only provide the below definitions to files that | ||
| 48 | are prepared to handle lispy things. CONSP is defined if lisp.h | ||
| 49 | has been included before this file. */ | ||
| 50 | #ifdef CONSP | ||
| 51 | |||
| 52 | enum event_kind | 47 | enum event_kind |
| 53 | { | 48 | { |
| 54 | NO_EVENT, /* nothing happened. This should never | 49 | NO_EVENT, /* nothing happened. This should never |
| @@ -317,8 +312,6 @@ extern void term_mouse_moveto (int, int); | |||
| 317 | extern struct tty_display_info *gpm_tty; | 312 | extern struct tty_display_info *gpm_tty; |
| 318 | #endif | 313 | #endif |
| 319 | 314 | ||
| 320 | #endif /* CONSP */ | ||
| 321 | |||
| 322 | 315 | ||
| 323 | struct ns_display_info; | 316 | struct ns_display_info; |
| 324 | struct x_display_info; | 317 | struct x_display_info; |