From: Dan Nicolaescu Date: Sun, 3 Oct 2010 16:21:55 +0000 (-0700) Subject: * src/termhooks.h: Remove #ifdef CONSP. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~46^2~208 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b5437a05eceec0f37a2d4544a0945a1cc159f00c;p=emacs.git * src/termhooks.h: Remove #ifdef CONSP. --- 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 + * termhooks.h: Remove #ifdef CONSP. + * xterm.c (NO_INLINE, noinline): Move definitions to ../configure.in. Include 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;