Index: Clock.c
===================================================================
RCS file: /cvs/xorg/app/xclock/Clock.c,v
retrieving revision 1.5
diff -U3 -r1.5 Clock.c
--- Clock.c	6 Dec 2005 16:26:51 -0000	1.5
+++ Clock.c	28 Mar 2006 17:22:46 -0000
@@ -1140,11 +1140,11 @@
 {
      ClockWidget w = (ClockWidget) gw;
      if (w->clock.interval_id) XtRemoveTimeOut (w->clock.interval_id);
-#ifdef RENDER
+#ifdef XRENDER
     if (w->clock.picture)
-	XRenderFreePicture (dpy, w->clock.picture);
+	XRenderFreePicture (XtDisplay(w), w->clock.picture);
     if (w->clock.fill_picture)
-	XRenderFreePicture (dpy, w->clock.fill_picture);
+	XRenderFreePicture (XtDisplay(w), w->clock.fill_picture);
 #endif
      XtReleaseGC (gw, w->clock.myGC);
      XtReleaseGC (gw, w->clock.HighGC);
Index: XClock-color.ad
===================================================================
RCS file: /cvs/xorg/app/xclock/XClock-color.ad,v
retrieving revision 1.2
diff -U3 -r1.2 XClock-color.ad
--- XClock-color.ad	23 Apr 2004 19:54:39 -0000	1.2
+++ XClock-color.ad	28 Mar 2006 17:22:46 -0000
@@ -2,7 +2,7 @@
 
 #include "XClock"
 
-#ifdef RENDER
+#ifdef XRENDER
 XClock.Clock.hourColor:		rgba:7f/00/00/c0
 XClock.Clock.minuteColor:	rgba:00/7f/7f/c0
 XClock.Clock.secondColor:	rgba:00/00/ff/80