Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 8351)
+++ trunk/src/hid.h	(revision 8352)
@@ -127,6 +127,14 @@
 	int (*throw_drc_dialog) (void);
 } pcb_hid_drc_gui_t;
 
+typedef enum pcb_mask_op_s {
+	HID_MASK_OFF,    /* Flushes the buffer and return to non-mask operation.  */
+	HID_MASK_BEFORE, /* Polygons being drawn before clears.  */
+	HID_MASK_CLEAR,  /* Clearances being drawn.  */
+	HID_MASK_SET,    /* Positive draw.  */
+	HID_MASK_AFTER   /* Polygons being drawn after clears.  */
+} pcb_mask_op_t;
+
 typedef struct hid_s pcb_hid_t;
 
 /* This is the main HID structure.  */
@@ -243,17 +251,7 @@
 	   call use_mask(HID_MASK_OFF) to flush the buffer to the HID.  If
 	   you use the "erase" color when use_mask is disabled, it simply
 	   draws in the background color.  */
-	void (*use_mask) (int use_it_);
-	/* Flushes the buffer and return to non-mask operation.  */
-#define HID_MASK_OFF 0
-	/* Polygons being drawn before clears.  */
-#define HID_MASK_BEFORE 1
-	/* Clearances being drawn.  */
-#define HID_MASK_CLEAR 2
-	/* Polygons being drawn after clears.  */
-#define HID_MASK_AFTER 3
-	/* Positive draw.  */
-#define HID_MASK_SET 5
+	void (*use_mask) (pcb_mask_op_t use_it_);
 
 	/* Sets a color.  Names can be like "red" or "#rrggbb" or special
 	   names like "erase".  *Always* use the "erase" color for removing
Index: trunk/src/hid_extents.c
===================================================================
--- trunk/src/hid_extents.c	(revision 8351)
+++ trunk/src/hid_extents.c	(revision 8352)
@@ -37,7 +37,7 @@
 	free(gc);
 }
 
-static void extents_use_mask(int use_it)
+static void extents_use_mask(pcb_mask_op_t use_it)
 {
 }
 
Index: trunk/src_plugins/export_dxf/dxf.c
===================================================================
--- trunk/src_plugins/export_dxf/dxf.c	(revision 8351)
+++ trunk/src_plugins/export_dxf/dxf.c	(revision 8352)
@@ -265,7 +265,7 @@
 static void dxf_show_item(void *item);
 static StringList *dxf_string_insert(char *str, StringList * list);
 static void dxf_use_gc(pcb_hid_gc_t gc, int radius);
-static void dxf_use_mask(int use_it);
+static void dxf_use_mask(pcb_mask_op_t use_it);
 static void dxf_write_block(FILE * fp, int id_code, char *xref_name,
 														char *block_name, char *linetype, char *layer, double x0,
 														double y0, double z0, double thickness, int color, int paperspace, int block_type);
@@ -4622,7 +4622,7 @@
  *   <li> <c>HID_MASK_AFTER == 3 </c> Polygons being drawn after clears.
  * </ul>
  */
-static void dxf_use_mask(int use_it) {
+static void dxf_use_mask(pcb_mask_op_t use_it) {
 #if DEBUG
 	fprintf(stderr, "[File: %s: line: %d] Entering dxf_use_mask () function.\n", __FILE__, __LINE__);
 #endif
Index: trunk/src_plugins/export_gcode/gcode.c
===================================================================
--- trunk/src_plugins/export_gcode/gcode.c	(revision 8351)
+++ trunk/src_plugins/export_gcode/gcode.c	(revision 8352)
@@ -587,7 +587,7 @@
 	free(gc);
 }
 
-static void gcode_use_mask(int use_it)
+static void gcode_use_mask(pcb_mask_op_t use_it)
 {
 	/* does nothing */
 }
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 8351)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 8352)
@@ -43,7 +43,7 @@
 static void gerber_parse_arguments(int *argc, char ***argv);
 static pcb_hid_gc_t gerber_make_gc(void);
 static void gerber_destroy_gc(pcb_hid_gc_t gc);
-static void gerber_use_mask(int use_it);
+static void gerber_use_mask(pcb_mask_op_t use_it);
 static void gerber_set_color(pcb_hid_gc_t gc, const char *name);
 static void gerber_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style);
 static void gerber_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width);
@@ -822,7 +822,7 @@
 	free(gc);
 }
 
-static void gerber_use_mask(int use_it)
+static void gerber_use_mask(pcb_mask_op_t use_it)
 {
 	current_mask = use_it;
 }
Index: trunk/src_plugins/export_nelma/nelma.c
===================================================================
--- trunk/src_plugins/export_nelma/nelma.c	(revision 8351)
+++ trunk/src_plugins/export_nelma/nelma.c	(revision 8352)
@@ -693,7 +693,7 @@
 	free(gc);
 }
 
-static void nelma_use_mask(int use_it)
+static void nelma_use_mask(pcb_mask_op_t use_it)
 {
 	/* does nothing */
 }
Index: trunk/src_plugins/export_openscad/scad.c
===================================================================
--- trunk/src_plugins/export_openscad/scad.c	(revision 8351)
+++ trunk/src_plugins/export_openscad/scad.c	(revision 8352)
@@ -293,7 +293,7 @@
 static int opt_board_cut;
 
 static int lastseq = 0;
-static int current_mask;
+static pcb_mask_op_t current_mask;
 
 static float scaled_layer_thickness;
 
@@ -846,7 +846,7 @@
 	free(gc);
 }
 
-static void scad_use_mask(int use_it)
+static void scad_use_mask(pcb_mask_op_t use_it)
 {
 	current_mask = use_it;
 }
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 8351)
+++ trunk/src_plugins/export_png/png.c	(revision 8352)
@@ -1073,7 +1073,7 @@
 	free(gc);
 }
 
-static void png_use_mask(int use_it)
+static void png_use_mask(pcb_mask_op_t use_it)
 {
 	if (photo_mode)
 		return;
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 8351)
+++ trunk/src_plugins/export_ps/eps.c	(revision 8352)
@@ -34,7 +34,7 @@
 static int eps_set_layer_group(pcb_layergrp_id_t group, pcb_layer_id_t layer, unsigned int flags, int is_empty);
 static pcb_hid_gc_t eps_make_gc(void);
 static void eps_destroy_gc(pcb_hid_gc_t gc);
-static void eps_use_mask(int use_it);
+static void eps_use_mask(pcb_mask_op_t use_it);
 static void eps_set_color(pcb_hid_gc_t gc, const char *name);
 static void eps_set_line_cap(pcb_hid_gc_t gc, pcb_cap_style_t style);
 static void eps_set_line_width(pcb_hid_gc_t gc, pcb_coord_t width);
@@ -414,7 +414,7 @@
 	free(gc);
 }
 
-static void eps_use_mask(int use_it)
+static void eps_use_mask(pcb_mask_op_t use_it)
 {
 	static int mask_pending = 0;
 	switch (use_it) {
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 8351)
+++ trunk/src_plugins/export_ps/ps.c	(revision 8352)
@@ -979,7 +979,7 @@
 	free(gc);
 }
 
-static void ps_use_mask(int use_it)
+static void ps_use_mask(pcb_mask_op_t use_it)
 {
 	/* does nothing */
 }
Index: trunk/src_plugins/export_svg/svg.c
===================================================================
--- trunk/src_plugins/export_svg/svg.c	(revision 8351)
+++ trunk/src_plugins/export_svg/svg.c	(revision 8352)
@@ -405,7 +405,7 @@
 	free(gc);
 }
 
-static void svg_use_mask(int use_it)
+static void svg_use_mask(pcb_mask_op_t use_it)
 {
 	if (use_it == HID_MASK_CLEAR) {
 		return;
Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c
===================================================================
--- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c	(revision 8351)
+++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c	(revision 8352)
@@ -158,7 +158,7 @@
 	gpmi_event(h->module, HIDE_fill_rect, h, gc, x1, y1, x2, y2);
 }
 
-void gpmi_hid_use_mask(int use_it)
+void gpmi_hid_use_mask(pcb_mask_op_t use_it)
 {
 	gpmi_hid_t *h = hid_gpmi_data_get(pcb_exporter);
 	gpmi_event(h->module, HIDE_use_mask, h, use_it);
Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h
===================================================================
--- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h	(revision 8351)
+++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.h	(revision 8352)
@@ -19,4 +19,4 @@
 void gpmi_hid_fill_rect(pcb_hid_gc_t gc, pcb_coord_t x1, pcb_coord_t y1, pcb_coord_t x2, pcb_coord_t y2);
 void gpmi_hid_fill_pcb_pv(pcb_hid_gc_t fg_gc, pcb_hid_gc_t bg_gc, pcb_pin_t *pad, pcb_bool drawHole, pcb_bool mask);
 void gpmi_hid_fill_pcb_pad(pcb_hid_gc_t gc, pcb_pad_t * pad, pcb_bool clear, pcb_bool mask);
-void gpmi_hid_use_mask(int use_it);
+void gpmi_hid_use_mask(pcb_mask_op_t use_it);
Index: trunk/src_plugins/hid_batch/batch.c
===================================================================
--- trunk/src_plugins/hid_batch/batch.c	(revision 8351)
+++ trunk/src_plugins/hid_batch/batch.c	(revision 8352)
@@ -168,7 +168,7 @@
 {
 }
 
-static void batch_use_mask(int use_it)
+static void batch_use_mask(pcb_mask_op_t use_it)
 {
 }
 
Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 8351)
+++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 8352)
@@ -400,7 +400,7 @@
 
 #define WHICH_GC(gc) (cur_mask == HID_MASK_CLEAR ? priv->mask_gc : (gc)->gc)
 
-static void ghid_gdk_use_mask(int use_it)
+static void ghid_gdk_use_mask(pcb_mask_op_t use_it)
 {
 	static int mask_seq_id = 0;
 	GdkColor color;
Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 8351)
+++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 8352)
@@ -302,7 +302,7 @@
 	glDisable(GL_TEXTURE_2D);
 }
 
-void ghid_gl_use_mask(int use_it)
+void ghid_gl_use_mask(pcb_mask_op_t use_it)
 {
 	static int stencil_bit = 0;
 
Index: trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c
===================================================================
--- trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c	(revision 8351)
+++ trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c	(revision 8352)
@@ -451,7 +451,7 @@
 
 #define WHICH_GC(gc) (cur_mask == HID_MASK_CLEAR ? priv->mask_gc : (gc)->gc)
 
-static void ghid_cairo_use_mask(int use_it)
+static void ghid_cairo_use_mask(pcb_mask_op_t use_it)
 {
 	static int mask_seq_id = 0;
 	GdkColor color;
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 8351)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 8352)
@@ -233,7 +233,7 @@
 
 PCB_REGISTER_ATTRIBUTES(lesstif_attribute_list, lesstif_cookie)
 
-static void lesstif_use_mask(int use_it);
+static void lesstif_use_mask(pcb_mask_op_t use_it);
 static void zoom_max();
 static void zoom_to(double factor, int x, int y);
 static void zoom_by(double factor, int x, int y);
@@ -2806,7 +2806,7 @@
 	free(gc);
 }
 
-static void lesstif_use_mask(int use_it)
+static void lesstif_use_mask(pcb_mask_op_t use_it)
 {
 	if ((conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly) && !use_xrender)
 		use_it = 0;
Index: trunk/src_plugins/hid_remote/remote.c
===================================================================
--- trunk/src_plugins/hid_remote/remote.c	(revision 8351)
+++ trunk/src_plugins/hid_remote/remote.c	(revision 8352)
@@ -201,7 +201,7 @@
 }
 
 static const char *mask_names[] = { "off", "before", "clear", "after" };
-static void remote_use_mask(int mask)
+static void remote_use_mask(pcb_mask_op_t mask)
 {
 	if ((mask >= 0) && (mask < sizeof(mask_names) / sizeof(mask_names[0])))
 		proto_send_use_mask(mask_names[mask]);
Index: trunk/src_plugins/loghid/hid-logger.c
===================================================================
--- trunk/src_plugins/loghid/hid-logger.c	(revision 8351)
+++ trunk/src_plugins/loghid/hid-logger.c	(revision 8352)
@@ -66,7 +66,7 @@
 	delegatee_->destroy_gc(gc);
 }
 
-static void log_use_mask(int use_it) {
+static void log_use_mask(pcb_mask_op_t use_it) {
 	pcb_fprintf(out_, "use_mask(%x)\n", use_it);
 	delegatee_->use_mask(use_it);
 }