From 0f2bec7919638589ac25b2a50f3294aa99aefe4e Mon Sep 17 00:00:00 2001 From: William McBrine Date: Mon, 16 Apr 2007 06:03:05 +0000 Subject: [PATCH] XtConvertAndStore() was added in R4, so the check was incorrect; and other, unchecked code already assumes R4 or greater, so we may as well discard the alternative here. --- x11/x11.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/x11/x11.c b/x11/x11.c index 9c2c819f..caa0d3b0 100644 --- a/x11/x11.c +++ b/x11/x11.c @@ -32,7 +32,7 @@ #include #include -RCSID("$Id: x11.c,v 1.80 2007/04/11 17:43:55 wmcbrine Exp $"); +RCSID("$Id: x11.c,v 1.81 2007/04/16 06:03:05 wmcbrine Exp $"); #ifndef XPOINTER_TYPEDEFED typedef char * XPointer; @@ -3143,28 +3143,16 @@ int XCursesSetupX(int argc, char *argv[]) rmfrom.size = sizeof(Pixel); rmto.size = sizeof(XColor); -#if XtSpecificationRelease > 4 rmto.addr = (XPointer)&pointerforecolor; rmfrom.addr = (XPointer)&(xc_app_data.pointerForeColor); XtConvertAndStore(drawing, XtRPixel, &rmfrom, XtRColor, &rmto); -#else - rmto.addr = (char *)&pointerforecolor; - rmfrom.addr = (char *)&(xc_app_data.pointerForeColor); - XtConvert(drawing, XtRPixel, &rmfrom, XtRColor, &rmto); -#endif rmfrom.size = sizeof(Pixel); rmto.size = sizeof(XColor); -#if XtSpecificationRelease > 4 rmfrom.addr = (XPointer)&(xc_app_data.pointerBackColor); rmto.addr = (XPointer)&pointerbackcolor; XtConvertAndStore(drawing, XtRPixel, &rmfrom, XtRColor, &rmto); -#else - rmfrom.addr = (char *)&(xc_app_data.pointerBackColor); - rmto.addr = (char *)&pointerbackcolor; - XtConvert(drawing, XtRPixel, &rmfrom, XtRColor, &rmto); -#endif XRecolorCursor(XCURSESDISPLAY, xc_app_data.pointer, &pointerforecolor, &pointerbackcolor);