Mercurial > emacs
changeset 6900:a3fd3d082bc4
entered into RCS
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Fri, 15 Apr 1994 22:40:48 +0000 |
| parents | 45751abc406f |
| children | 01e7faac0761 |
| files | lwlib/dispatch.c |
| diffstat | 1 files changed, 10 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lwlib/dispatch.c Fri Apr 15 22:39:31 1994 +0000 +++ b/lwlib/dispatch.c Fri Apr 15 22:40:48 1994 +0000 @@ -30,20 +30,15 @@ #include <X11/Xatom.h> #include "dispatch.h" -#ifdef THIS_IS_X11R4 - -#ifdef THIS_IS_X11R5 -ERROR!! only one of THIS_IS_X11R4 or THIS_IS_X11R5 must be defined. -#endif +#include <X11/Xlib.h> +#include <X11/cursorfont.h> +#include <X11/Xutil.h> -#else /* ! THIS_IS_X11R4 */ - -#ifndef THIS_IS_X11R5 -ERROR!! one of THIS_IS_X11R4 or THIS_IS_X11R5 must be defined. +#ifdef XlibSpecificationRelease +#if XlibSpecificationRelease >= 5 +#define HAVE_X11R5 #endif - -#endif /* ! THIS_IS_X11R4 */ - +#endif /* ## All of the code on this page was copied from the X11R5 lib/Xt/Event.c, ## but is compatible with X11R4; the code in Event.c is different, but @@ -114,7 +109,7 @@ NonMaskableMask /* MappingNotify */ }; -#ifdef THIS_IS_X11R4 +#ifndef HAVE_X11R5 static /* in R5, this is not static, so we don't need to define it at all */ EventMask _XtConvertTypeToMask (eventType) @@ -127,7 +122,7 @@ return 0; } -#endif /* R4 */ +#endif /* not HAVE_X11R5 */ /* -- _XtOnGrabList() omitted -- */ @@ -174,7 +169,7 @@ for (p=widget->core.event_table; p != NULL; p = p->next) if ((mask & p->mask) != 0 -#ifdef THIS_IS_X11R4 +#ifndef HAVE_X11R5 || (mask == 0 && p->non_filter) #endif )