Index: lpr.c
===================================================================
--- lpr.c	(revision 4787)
+++ lpr.c	(revision 4788)
@@ -23,7 +23,7 @@
 
 const char *lpr_cookie = "lpr HID";
 
-static HID_Attribute base_lpr_options[] = {
+static hid_attribute_t base_lpr_options[] = {
 
 /* %start-doc options "98 lpr Printing Options"
 @ftable @code
@@ -42,11 +42,11 @@
 
 #define NUM_OPTIONS (sizeof(lpr_options)/sizeof(lpr_options[0]))
 
-static HID_Attribute *lpr_options = 0;
+static hid_attribute_t *lpr_options = 0;
 static int num_lpr_options = 0;
-static HID_Attr_Val *lpr_values;
+static hid_attr_val_t *lpr_values;
 
-static HID_Attribute *lpr_get_export_options(int *n)
+static hid_attribute_t *lpr_get_export_options(int *n)
 {
 	/*
 	 * We initialize the default value in this manner because the GUI
@@ -58,11 +58,11 @@
 	}
 
 	if (lpr_options == 0) {
-		HID_Attribute *ps_opts = ps_hid.get_export_options(&num_lpr_options);
-		lpr_options = (HID_Attribute *) calloc(num_lpr_options, sizeof(HID_Attribute));
-		memcpy(lpr_options, ps_opts, num_lpr_options * sizeof(HID_Attribute));
+		hid_attribute_t *ps_opts = ps_hid.get_export_options(&num_lpr_options);
+		lpr_options = (hid_attribute_t *) calloc(num_lpr_options, sizeof(hid_attribute_t));
+		memcpy(lpr_options, ps_opts, num_lpr_options * sizeof(hid_attribute_t));
 		memcpy(lpr_options, base_lpr_options, sizeof(base_lpr_options));
-		lpr_values = (HID_Attr_Val *) calloc(num_lpr_options, sizeof(HID_Attr_Val));
+		lpr_values = (hid_attr_val_t *) calloc(num_lpr_options, sizeof(hid_attr_val_t));
 	}
 	if (n)
 		*n = num_lpr_options;
@@ -69,7 +69,7 @@
 	return lpr_options;
 }
 
-static void lpr_do_export(HID_Attr_Val * options)
+static void lpr_do_export(hid_attr_val_t * options)
 {
 	FILE *f;
 	int i;