More bits of ANSIfying

1 files changed, 33 insertions, 37 deletions

diff --git a/generic/tkColor.h b/generic/tkColor.h
index 53975c1..f662ebe 100644
--- a/generic/tkColor.h
+++ b/generic/tkColor.h
@@ -1,15 +1,14 @@
 /*
  * tkColor.h --
  *
- *	Declarations of data types and functions used by the
- *	Tk color module.
+ *	Declarations of data types and functions used by the Tk color module.
  *
  * Copyright (c) 1996-1997 by Sun Microsystems, Inc.
  *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkColor.h,v 1.6 1999/11/19 22:00:03 hobbs Exp $
+ * RCS: @(#) $Id: tkColor.h,v 1.7 2005/11/11 23:51:27 dkf Exp $
  */
 
 #ifndef _TKCOLOR
@@ -18,14 +17,14 @@
 #include <tkInt.h>
 
 #ifdef BUILD_tk
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLEXPORT
 #endif
 
 /*
- * One of the following data structures is used to keep track of
- * each color that is being used by the application; typically there
- * is a colormap entry allocated for each of these colors.
+ * One of the following data structures is used to keep track of each color
+ * that is being used by the application; typically there is a colormap entry
+ * allocated for each of these colors.
  */
 
 #define TK_COLOR_BY_NAME	1
@@ -36,39 +35,38 @@
 typedef struct TkColor {
     XColor color;		/* Information about this color. */
     unsigned int magic;		/* Used for quick integrity check on this
-				 * structure.   Must always have the
-				 * value COLOR_MAGIC. */
+				 * structure.  Must always have the value
+				 * COLOR_MAGIC. */
     GC gc;			/* Simple gc with this color as foreground
-				 * color and all other fields defaulted.
-				 * May be None. */
-    Screen *screen;		/* Screen where this color is valid.  Used
-				 * to delete it, and to find its display. */
+				 * color and all other fields defaulted. May
+				 * be None. */
+    Screen *screen;		/* Screen where this color is valid. Used to
+				 * delete it, and to find its display. */
     Colormap colormap;		/* Colormap from which this entry was
 				 * allocated. */
     Visual *visual;             /* Visual associated with colormap. */
     int resourceRefCount;	/* Number of active uses of this color (each
 				 * active use corresponds to a call to
-				 * Tk_AllocColorFromObj or Tk_GetColor).
-				 * If this count is 0, then this TkColor
+				 * Tk_AllocColorFromObj or Tk_GetColor). If
+				 * this count is 0, then this TkColor
 				 * structure is no longer valid and it isn't
-				 * present in a hash table: it is being
-				 * kept around only because there are objects
-				 * referring to it.  The structure is freed
-				 * when resourceRefCount and objRefCount
-				 * are both 0. */
+				 * present in a hash table: it is being kept
+				 * around only because there are objects
+				 * referring to it. The structure is freed
+				 * when resourceRefCount and objRefCount are
+				 * both 0. */
     int objRefCount;		/* The number of Tcl objects that reference
 				 * this structure. */
     int type;			/* TK_COLOR_BY_NAME or TK_COLOR_BY_VALUE */
     Tcl_HashEntry *hashPtr;	/* Pointer to hash table entry for this
 				 * structure. (for use in deleting entry). */
     struct TkColor *nextPtr;	/* Points to the next TkColor structure with
-				 * the same color name.  Colors with the
-				 * same name but different screens or
-				 * colormaps are chained together off a
-				 * single entry in nameTable.  For colors in
-				 * valueTable (those allocated by
-				 * Tk_GetColorByValue) this field is always
-				 * NULL. */
+				 * the same color name. Colors with the same
+				 * name but different screens or colormaps are
+				 * chained together off a single entry in
+				 * nameTable. For colors in valueTable (those
+				 * allocated by Tk_GetColorByValue) this field
+				 * is always NULL. */
 } TkColor;
 
 /*
@@ -76,14 +74,12 @@ typedef struct TkColor {
  */
 
 #ifndef TkpFreeColor
-EXTERN void		TkpFreeColor _ANSI_ARGS_((TkColor *tkColPtr));
+EXTERN void		TkpFreeColor(TkColor *tkColPtr);
 #endif
-EXTERN TkColor *	TkpGetColor _ANSI_ARGS_((Tk_Window tkwin,
-			    Tk_Uid name));
-EXTERN TkColor *	TkpGetColorByValue _ANSI_ARGS_((Tk_Window tkwin,
-			    XColor *colorPtr));	
+EXTERN TkColor *	TkpGetColor(Tk_Window tkwin, Tk_Uid name);
+EXTERN TkColor *	TkpGetColorByValue(Tk_Window tkwin, XColor *colorPtr);
 
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
 
 #endif /* _TKCOLOR */