# HG changeset patch # User Dan Nicolaescu # Date 1255929067 0 # Node ID f4161811f50ea821a05d7e7640818ab848b09f95 # Parent 6f463ea7a91a1623d92f289a7a9c31a1957bf5a2 * xterm.c: * xfns.c: Remove always true condition: XtSpecificationRelease >= 5. diff -r 6f463ea7a91a -r f4161811f50e src/ChangeLog --- a/src/ChangeLog Mon Oct 19 05:04:22 2009 +0000 +++ b/src/ChangeLog Mon Oct 19 05:11:07 2009 +0000 @@ -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 -r 6f463ea7a91a -r f4161811f50e src/xfns.c --- a/src/xfns.c Mon Oct 19 05:04:22 2009 +0000 +++ b/src/xfns.c Mon Oct 19 05:11:07 2009 +0000 @@ -98,13 +98,10 @@ #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 -r 6f463ea7a91a -r f4161811f50e src/xterm.c --- a/src/xterm.c Mon Oct 19 05:04:22 2009 +0000 +++ b/src/xterm.c Mon Oct 19 05:11:07 2009 +0000 @@ -113,7 +113,7 @@ #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 */