--- gs5.50/gdevcdj.c.gcc296	Mon Feb 14 03:29:31 2000
+++ gs5.50/gdevcdj.c	Wed Aug  2 16:30:23 2000
@@ -162,8 +162,8 @@
 
 private int cdj_param_check_bytes(P5(gs_param_list *, gs_param_name, const byte *, uint, bool));
 private int cdj_param_check_float(P4(gs_param_list *, gs_param_name, floatp, bool));
-#define cdj_param_check_string(plist, pname, str, defined)\
-  cdj_param_check_bytes(plist, pname, (const byte *)str, strlen(str), defined)
+#define cdj_param_check_string(plist, pname, strg, isdefined)\
+  cdj_param_check_bytes(plist, pname, (const byte *)strg, strlen(strg), isdefined)
 
 /*
  * Drivers stuff.
--- gs5.50/gsdparam.c.gcc296	Wed Aug  2 17:21:34 2000
+++ gs5.50/gsdparam.c	Wed Aug  2 17:22:08 2000
@@ -375,12 +375,12 @@
 #endif /****** not used ***** */
 private int param_check_long(P4(gs_param_list *, gs_param_name, long, bool));
 
-#define param_check_int(plist, pname, ival, defined)\
-  param_check_long(plist, pname, (long)(ival), defined)
+#define param_check_int(plist, pname, ival, isdefined)\
+  param_check_long(plist, pname, (long)(ival), isdefined)
 private int param_check_bytes(P5(gs_param_list *, gs_param_name, const byte *, uint, bool));
 
-#define param_check_string(plist, pname, str, defined)\
-  param_check_bytes(plist, pname, (const byte *)str, strlen(str), defined)
+#define param_check_string(plist, pname, strg, isdefined)\
+  param_check_bytes(plist, pname, (const byte *)strg, strlen(strg), isdefined)
 
 /* Set the device parameters. */
 /* If the device was open and the put_params procedure closed it, */