Some more (internal) ClientData -> void * changes

1 files changed, 28 insertions, 28 deletions

diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
index 90b3c90..8452cf1 100644
--- a/win/tclWinConsole.c
+++ b/win/tclWinConsole.c
@@ -210,29 +210,29 @@ typedef struct {
  * Declarations for functions used only in this file.
  */
 
-static int	ConsoleBlockModeProc(ClientData instanceData, int mode);
-static void	ConsoleCheckProc(ClientData clientData, int flags);
-static int	ConsoleCloseProc(ClientData instanceData,
+static int	ConsoleBlockModeProc(void *instanceData, int mode);
+static void	ConsoleCheckProc(void *clientData, int flags);
+static int	ConsoleCloseProc(void *instanceData,
 		    Tcl_Interp *interp, int flags);
 static int	ConsoleEventProc(Tcl_Event *evPtr, int flags);
-static void	ConsoleExitHandler(ClientData clientData);
-static int	ConsoleGetHandleProc(ClientData instanceData,
-		    int direction, ClientData *handlePtr);
-static int	ConsoleGetOptionProc(ClientData instanceData,
+static void	ConsoleExitHandler(void *clientData);
+static int	ConsoleGetHandleProc(void *instanceData,
+		    int direction, void **handlePtr);
+static int	ConsoleGetOptionProc(void *instanceData,
 		    Tcl_Interp *interp, const char *optionName,
 		    Tcl_DString *dsPtr);
 static void	ConsoleInit(void);
-static int	ConsoleInputProc(ClientData instanceData, char *buf,
+static int	ConsoleInputProc(void *instanceData, char *buf,
 		    int toRead, int *errorCode);
-static int	ConsoleOutputProc(ClientData instanceData,
+static int	ConsoleOutputProc(void *instanceData,
 		    const char *buf, int toWrite, int *errorCode);
-static int	ConsoleSetOptionProc(ClientData instanceData,
+static int	ConsoleSetOptionProc(void *instanceData,
 		    Tcl_Interp *interp, const char *optionName,
 		    const char *value);
-static void	ConsoleSetupProc(ClientData clientData, int flags);
-static void	ConsoleWatchProc(ClientData instanceData, int mask);
-static void	ProcExitHandler(ClientData clientData);
-static void	ConsoleThreadActionProc(ClientData instanceData, int action);
+static void	ConsoleSetupProc(void *clientData, int flags);
+static void	ConsoleWatchProc(void *instanceData, int mask);
+static void	ProcExitHandler(void *clientData);
+static void	ConsoleThreadActionProc(void *instanceData, int action);
 static DWORD	ReadConsoleChars(HANDLE hConsole, WCHAR *lpBuffer,
 		    RingSizeT nChars, RingSizeT *nCharsReadPtr);
 static DWORD	WriteConsoleChars(HANDLE hConsole,
@@ -670,7 +670,7 @@ ConsoleInit(void)
 
 static void
 ConsoleExitHandler(
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     Tcl_DeleteEventSource(ConsoleSetupProc, ConsoleCheckProc, NULL);
 }
@@ -694,7 +694,7 @@ ConsoleExitHandler(
 
 static void
 ProcExitHandler(
-    TCL_UNUSED(ClientData))
+    TCL_UNUSED(void *))
 {
     AcquireSRWLockExclusive(&gConsoleLock);
     gInitialized = 0;
@@ -759,7 +759,7 @@ void NudgeWatchers (HANDLE consoleHandle)
 
 void
 ConsoleSetupProc(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
 {
     ConsoleChannelInfo *chanInfoPtr;
@@ -824,7 +824,7 @@ ConsoleSetupProc(
 
 static void
 ConsoleCheckProc(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
 {
     ConsoleChannelInfo *chanInfoPtr;
@@ -924,7 +924,7 @@ ConsoleCheckProc(
 
 static int
 ConsoleBlockModeProc(
-    ClientData instanceData,	/* Instance data for channel. */
+    void *instanceData,	/* Instance data for channel. */
     int mode)			/* TCL_MODE_BLOCKING or
 				 * TCL_MODE_NONBLOCKING. */
 {
@@ -964,7 +964,7 @@ ConsoleBlockModeProc(
 
 static int
 ConsoleCloseProc(
-    ClientData instanceData,	/* Pointer to ConsoleChannelInfo structure. */
+    void *instanceData,	/* Pointer to ConsoleChannelInfo structure. */
     TCL_UNUSED(Tcl_Interp *),
     int flags)
 {
@@ -1083,7 +1083,7 @@ ConsoleCloseProc(
  */
 static int
 ConsoleInputProc(
-    ClientData instanceData,	/* Console state. */
+    void *instanceData,	/* Console state. */
     char *bufPtr,		/* Where to store data read. */
     int bufSize,		/* How much space is available in the
 				 * buffer? */
@@ -1236,7 +1236,7 @@ ConsoleInputProc(
  */
 static int
 ConsoleOutputProc(
-    ClientData instanceData,	/* Console state. */
+    void *instanceData,	/* Console state. */
     const char *buf,		/* The data buffer. */
     int toWrite,		/* How many bytes to write? */
     int *errorCode)		/* Where to store error code. */
@@ -1476,7 +1476,7 @@ ConsoleEventProc(
 
 static void
 ConsoleWatchProc(
-    ClientData instanceData,	/* Console state. */
+    void *instanceData,	/* Console state. */
     int newMask)		/* What events to watch for, one of
 				 * of TCL_READABLE, TCL_WRITABLE
 				 */
@@ -1552,9 +1552,9 @@ ConsoleWatchProc(
 
 static int
 ConsoleGetHandleProc(
-    ClientData instanceData,	/* The console state. */
+    void *instanceData,	/* The console state. */
     TCL_UNUSED(int) /*direction*/,
-    ClientData *handlePtr)	/* Where to store the handle. */
+    void **handlePtr)	/* Where to store the handle. */
 {
     ConsoleChannelInfo *chanInfoPtr = (ConsoleChannelInfo *)instanceData;
 
@@ -2223,7 +2223,7 @@ TclWinOpenConsoleChannel(
 
 static void
 ConsoleThreadActionProc(
-    ClientData instanceData,
+    void *instanceData,
     int action)
 {
     ConsoleChannelInfo *chanInfoPtr = (ConsoleChannelInfo *)instanceData;
@@ -2256,7 +2256,7 @@ ConsoleThreadActionProc(
  */
 static int
 ConsoleSetOptionProc(
-    ClientData instanceData,	/* File state. */
+    void *instanceData,	/* File state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Which option to set? */
     const char *value)		/* New value for option. */
@@ -2345,7 +2345,7 @@ ConsoleSetOptionProc(
 
 static int
 ConsoleGetOptionProc(
-    ClientData instanceData,	/* File state. */
+    void *instanceData,	/* File state. */
     Tcl_Interp *interp,		/* For error reporting - can be NULL. */
     const char *optionName,	/* Option to get. */
     Tcl_DString *dsPtr)		/* Where to store value(s). */