From ee6bacd40debc7ca7ec95c6f962ae533e8713a02 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 19 Oct 2009 05:11:07 +0000 Subject: [PATCH] * xterm.c: * xfns.c: Remove always true condition: XtSpecificationRelease >= 5. --- src/ChangeLog | 3 +++ src/xfns.c | 7 ++----- src/xterm.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 51c01fbc199..6efec645f78 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2009-10-19 Dan Nicolaescu + * xterm.c: + * xfns.c: Remove always true condition: XtSpecificationRelease >= 5. + * alloc.c: Do not define struct catchtag. * eval.c: Move struct catchtag definition ... * lisp.h: ... here. diff --git a/src/xfns.c b/src/xfns.c index 4fc08925ebb..b9217617e30 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -98,13 +98,10 @@ along with GNU Emacs. If not, see . */ #include #endif -/* Do the EDITRES protocol if running X11R5 - Exception: HP-UX (at least version A.09.05) has X11R5 without EditRes */ - -#if (XtSpecificationRelease >= 5) && !defined(NO_EDITRES) +#if !defined(NO_EDITRES) #define HACK_EDITRES extern void _XEditResCheckMessages (); -#endif /* R5 + Athena */ +#endif /* not defined NO_EDITRES */ /* Unique id counter for widgets created by the Lucid Widget Library. */ diff --git a/src/xterm.c b/src/xterm.c index c77136eb64a..5a004873507 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -113,7 +113,7 @@ extern void free_frame_menubar P_ ((struct frame *)); #endif #ifdef USE_X_TOOLKIT -#if (XtSpecificationRelease >= 5) && !defined(NO_EDITRES) +#if !defined(NO_EDITRES) #define HACK_EDITRES extern void _XEditResCheckMessages (); #endif /* not NO_EDITRES */ -- 2.11.4.GIT