Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 4779)
+++ trunk/src/draw.c	(revision 4780)
@@ -62,7 +62,7 @@
 #define	LARGE_TEXT_SIZE			3
 #define	N_TEXT_SIZES			4
 
-OutputType Output;							/* some widgets ... used for drawing */
+pcb_output_t Output;							/* some widgets ... used for drawing */
 
 /* ---------------------------------------------------------------------------
  * some local identifiers
Index: trunk/src/draw.h
===================================================================
--- trunk/src/draw.h	(revision 4779)
+++ trunk/src/draw.h	(revision 4780)
@@ -39,9 +39,9 @@
 	hidGC bgGC,										/* background and foreground; */
 	  fgGC,												/* changed from some routines */
 	  pmGC;												/* depth 1 pixmap GC to store clip */
-} OutputType, *OutputTypePtr;
+} pcb_output_t;
 
-extern OutputType Output;
+extern pcb_output_t Output;
 
 /* Temporarily inhibid drawing if this is non-zero. A function that calls a
    lot of other functions that would call Draw() a lot in turn may increase