--- ray/src/rt/x11.c	1993/06/04 14:48:52	2.12
+++ ray/src/rt/x11.c	1993/11/22 11:33:02	2.14
@@ -78,8 +78,8 @@ static struct driver  x11_driver = {
 	x11_comout, x11_comin, x11_flush, 1.0
 };
 
-static int  getpixels(), xnewcolr(), freepixels(),
-		getevent(), getkey(), fixwindow();
+static int  getpixels(), xnewcolr(), freepixels(), resizewindow(),
+		getevent(), getkey(), fixwindow(), x11_getc();
 static unsigned long  true_pixel();
 
 
@@ -125,7 +125,8 @@ char  *name, *id;
 		ourwhite = WhitePixel(ourdisplay,ourscreen);
 	}
 					/* set gamma */
-	if ((gv = getenv("GAMMA")) != NULL)
+	if ((gv = XGetDefault(ourdisplay, "radiance", "gamma")) != NULL
+			|| (gv = getenv("GAMMA")) != NULL)
 		make_gmap(atof(gv));
 	else
 		make_gmap(GAMMA);
@@ -270,8 +271,6 @@ static
 x11_comin(inp, prompt)		/* read in a command line */
 char  *inp, *prompt;
 {
-	extern int  x11_getc();
-
 	if (prompt != NULL)
 		if (fromcombuf(inp, &x11_driver))
 			return;