Fixed the __unused macro to avoid a clash with dummy variables used in 64 bits headers

1 files changed, 43 insertions, 43 deletions

diff --git a/generic/tkZinc.c b/generic/tkZinc.c
index a5af97d..3f84441 100644
--- a/generic/tkZinc.c
+++ b/generic/tkZinc.c
@@ -547,9 +547,9 @@ static void	Repair _ANSI_ARGS_((ZnWInfo	*wi));
  *----------------------------------------------------------------------
  */
 static int
-ZnReliefParse(ClientData	client_data __unused,
-	      Tcl_Interp	*interp __unused,
-	      Tk_Window		tkwin __unused,
+ZnReliefParse(ClientData	client_data __znunused,
+	      Tcl_Interp	*interp __znunused,
+	      Tk_Window		tkwin __znunused,
 	      Tcl_Obj		*ovalue,
 	      char		*widget_rec,
 	      int		offset)
@@ -569,11 +569,11 @@ ZnReliefParse(ClientData	client_data __unused,
 }
 
 static Tcl_Obj *
-ZnReliefPrint(ClientData	client_data __unused,
-	      Tk_Window		tkwin __unused,
+ZnReliefPrint(ClientData	client_data __znunused,
+	      Tk_Window		tkwin __znunused,
 	      char		*widget_rec,
 	      int		offset,
-	      Tcl_FreeProc	**free_proc __unused)
+	      Tcl_FreeProc	**free_proc __znunused)
 {
   ZnReliefStyle relief = *(ZnReliefStyle *) (widget_rec + offset);
   return Tcl_NewStringObj(ZnNameOfRelief(relief), -1);
@@ -590,7 +590,7 @@ ZnReliefPrint(ClientData	client_data __unused,
  *----------------------------------------------------------------------
  */
 static int
-ZnGradientParse(ClientData	client_data __unused,
+ZnGradientParse(ClientData	client_data __znunused,
 		Tcl_Interp	*interp,
 		Tk_Window	tkwin,
 		Tcl_Obj		*ovalue,
@@ -616,11 +616,11 @@ ZnGradientParse(ClientData	client_data __unused,
 }
 
 static Tcl_Obj *
-ZnGradientPrint(ClientData	client_data __unused,
-		Tk_Window	tkwin __unused,
+ZnGradientPrint(ClientData	client_data __znunused,
+		Tk_Window	tkwin __znunused,
 		char		*widget_rec,
 		int		offset,
-		Tcl_FreeProc	**free_proc __unused)
+		Tcl_FreeProc	**free_proc __znunused)
 {
   ZnGradient *gradient = *(ZnGradient **) (widget_rec + offset);
   return Tcl_NewStringObj(ZnNameOfGradient(gradient), -1);
@@ -638,9 +638,9 @@ ZnGradientPrint(ClientData	client_data __unused,
  *----------------------------------------------------------------------
  */
 static int
-ZnBitmapParse(ClientData	client_data __unused,
-	      Tcl_Interp	*interp __unused,
-	      Tk_Window		tkwin __unused,
+ZnBitmapParse(ClientData	client_data __znunused,
+	      Tcl_Interp	*interp __znunused,
+	      Tk_Window		tkwin __znunused,
 	      Tcl_Obj		*ovalue,
 	      char		*widget_rec,
 	      int		offset)
@@ -683,9 +683,9 @@ ZnImageUpdate(void *client_data)
 }
 
 static int
-ZnImageParse(ClientData	client_data __unused,
-	     Tcl_Interp	*interp __unused,
-	     Tk_Window	tkwin __unused,
+ZnImageParse(ClientData	client_data __znunused,
+	     Tcl_Interp	*interp __znunused,
+	     Tk_Window	tkwin __znunused,
 	     Tcl_Obj	*ovalue,
 	     char	*widget_rec,
 	     int	offset)
@@ -714,11 +714,11 @@ ZnImageParse(ClientData	client_data __unused,
 }
 
 static Tcl_Obj *
-ZnImagePrint(ClientData		client_data __unused,
-	     Tk_Window		tkwin __unused,
+ZnImagePrint(ClientData		client_data __znunused,
+	     Tk_Window		tkwin __znunused,
 	     char		*widget_rec,
 	     int		offset,
-	     Tcl_FreeProc	**free_proc __unused)
+	     Tcl_FreeProc	**free_proc __znunused)
 {
   ZnImage image = *(ZnImage *) (widget_rec + offset);
   return Tcl_NewStringObj(image?ZnNameOfImage(image):"", -1);
@@ -735,14 +735,14 @@ ZnImagePrint(ClientData		client_data __unused,
  *----------------------------------------------------------------------
  */
 static int
-ZnSetReliefOpt(ClientData	client_data __unused,
-	       Tcl_Interp	*interp __unused,
-	       Tk_Window	tkwin __unused,
+ZnSetReliefOpt(ClientData	client_data __znunused,
+	       Tcl_Interp	*interp __znunused,
+	       Tk_Window	tkwin __znunused,
 	       Tcl_Obj		**ovalue,
 	       char		*widget_rec,
 	       int		offset,
 	       char		*old_val_ptr,
-	       int		flags __unused)
+	       int		flags __znunused)
 {
   ZnReliefStyle *relief_ptr;
   ZnReliefStyle relief;
@@ -760,8 +760,8 @@ ZnSetReliefOpt(ClientData	client_data __unused,
 }
 
 static Tcl_Obj *
-ZnGetReliefOpt(ClientData	client_data __unused,
-	       Tk_Window	tkwin __unused,
+ZnGetReliefOpt(ClientData	client_data __znunused,
+	       Tk_Window	tkwin __znunused,
 	       char		*widget_rec,
 	       int		offset)
 {
@@ -770,8 +770,8 @@ ZnGetReliefOpt(ClientData	client_data __unused,
 }
 
 static void
-ZnRestoreReliefOpt(ClientData	client_data __unused,
-		   Tk_Window	tkwin __unused,
+ZnRestoreReliefOpt(ClientData	client_data __znunused,
+		   Tk_Window	tkwin __znunused,
 		   char		*val_ptr,
 		   char		*old_val_ptr)
 {
@@ -789,14 +789,14 @@ ZnRestoreReliefOpt(ClientData	client_data __unused,
  *----------------------------------------------------------------------
  */
 static int
-ZnSetGradientOpt(ClientData	client_data __unused,
+ZnSetGradientOpt(ClientData	client_data __znunused,
 		 Tcl_Interp	*interp,
 		 Tk_Window	tkwin,
 		 Tcl_Obj	**ovalue,
 		 char		*widget_rec,
 		 int		offset,
 		 char		*old_val_ptr,
-		 int		flags __unused)
+		 int		flags __znunused)
 {
   ZnGradient	**grad_ptr;
   ZnGradient	*grad;
@@ -820,8 +820,8 @@ ZnSetGradientOpt(ClientData	client_data __unused,
 }
 
 static Tcl_Obj *
-ZnGetGradientOpt(ClientData	client_data __unused,
-		 Tk_Window	tkwin __unused,
+ZnGetGradientOpt(ClientData	client_data __znunused,
+		 Tk_Window	tkwin __znunused,
 		 char		*widget_rec,
 		 int		offset)
 {
@@ -830,8 +830,8 @@ ZnGetGradientOpt(ClientData	client_data __unused,
 }
 
 static void
-ZnRestoreGradientOpt(ClientData	client_data __unused,
-		     Tk_Window	tkwin __unused,
+ZnRestoreGradientOpt(ClientData	client_data __znunused,
+		     Tk_Window	tkwin __znunused,
 		     char	*val_ptr,
 		     char	*old_val_ptr)
 {
@@ -842,8 +842,8 @@ ZnRestoreGradientOpt(ClientData	client_data __unused,
 }
 
 static void
-ZnFreeGradientOpt(ClientData	client_data __unused,
-		  Tk_Window	tkwin __unused,
+ZnFreeGradientOpt(ClientData	client_data __znunused,
+		  Tk_Window	tkwin __znunused,
 		  char		*val_ptr)
 {
   if (*(ZnGradient **) val_ptr != NULL) {
@@ -2593,7 +2593,7 @@ ZnItemWithTagOrId(ZnWInfo	*wi,
  */
 static int
 LayoutItems(ZnWInfo	*wi,
-	    int		argc __unused,
+	    int		argc __znunused,
 	    Tcl_Obj	*CONST args[])
 {
   int		index/*, result*/;
@@ -8838,10 +8838,10 @@ ZnTessEnd(void	*data)
 
 static void
 ZnTessCombine(GLdouble	coords[3],
-	      void	*vertex_data[4] __unused,
-	      GLfloat	weight[4] __unused,
+	      void	*vertex_data[4] __znunused,
+	      GLfloat	weight[4] __znunused,
 	      void	**out_data,
-	      void	*data __unused)
+	      void	*data __znunused)
 {
   ZnCombineData	*cdata;
   
@@ -8858,7 +8858,7 @@ ZnTessCombine(GLdouble	coords[3],
 
 static void
 ZnTessError(GLenum	errno,
-	    void	*data __unused)
+	    void	*data __znunused)
 {
   fprintf(stderr, "Tesselation error in curve item: %d\n", errno);
 }
@@ -9060,9 +9060,9 @@ Tkzinc_debug_Init(Tcl_Interp *interp)	/* Used for error reporting. */
  *----------------------------------------------------------------------
  */
 BOOL APIENTRY
-DllEntryPoint(HINSTANCE	hInst __unused,	   /* Library instance handle. */
-	      DWORD	reason __unused,   /* Reason this function is being called. */
-	      LPVOID	reserved __unused) /* Not used. */
+DllEntryPoint(HINSTANCE	hInst __znunused,	   /* Library instance handle. */
+	      DWORD	reason __znunused,   /* Reason this function is being called. */
+	      LPVOID	reserved __znunused) /* Not used. */
 {
     return TRUE;
 }