1 files changed, 29 insertions, 29 deletions

diff --git a/unix/tclXtNotify.c b/unix/tclXtNotify.c
index 87f7e86..b2d1f4d 100644
--- a/unix/tclXtNotify.c
+++ b/unix/tclXtNotify.c
@@ -4,20 +4,17 @@
  *	This file contains the notifier driver implementation for the Xt
  *	intrinsics.
  *
- * Copyright © 1997 Sun Microsystems, Inc.
+ * Copyright (c) 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.
  */
 
-#ifndef USE_TCL_STUBS
-#   define USE_TCL_STUBS
-#endif
 #include <X11/Intrinsic.h>
 #include "tclInt.h"
 
 /*
- * This structure is used to keep track of the notifier info for a
+ * This structure is used to keep track of the notifier info for a a
  * registered file.
  */
 
@@ -33,7 +30,7 @@ typedef struct FileHandler {
     XtInputId except;		/* Xt exception callback handle. */
     Tcl_FileProc *proc;		/* Procedure to call, in the style of
 				 * Tcl_CreateFileHandler. */
-    void *clientData;	/* Argument to pass to proc. */
+    ClientData clientData;	/* Argument to pass to proc. */
     struct FileHandler *nextPtr;/* Next in list of all files we care about. */
 } FileHandler;
 
@@ -42,7 +39,7 @@ typedef struct FileHandler {
  * handlers are ready to fire.
  */
 
-typedef struct {
+typedef struct FileHandlerEvent {
     Tcl_Event header;		/* Information that is standard for all
 				 * events. */
     int fd;			/* File descriptor that is ready. Used to find
@@ -79,19 +76,19 @@ static int initialized = 0;
 static int		FileHandlerEventProc(Tcl_Event *evPtr, int flags);
 static void		FileProc(XtPointer clientData, int *source,
 			    XtInputId *id);
-static void		NotifierExitHandler(void *clientData);
+static void		NotifierExitHandler(ClientData clientData);
 static void		TimerProc(XtPointer clientData, XtIntervalId *id);
 static void		CreateFileHandler(int fd, int mask,
-			    Tcl_FileProc *proc, void *clientData);
+			    Tcl_FileProc *proc, ClientData clientData);
 static void		DeleteFileHandler(int fd);
-static void		SetTimer(const Tcl_Time * timePtr);
-static int		WaitForEvent(const Tcl_Time * timePtr);
+static void		SetTimer(Tcl_Time * timePtr);
+static int		WaitForEvent(Tcl_Time * timePtr);
 
 /*
  * Functions defined in this file for use by users of the Xt Notifier:
  */
 
-MODULE_SCOPE void	InitNotifier(void);
+MODULE_SCOPE void InitNotifier(void);
 MODULE_SCOPE XtAppContext TclSetAppContext(XtAppContext ctx);
 
 /*
@@ -132,7 +129,7 @@ TclSetAppContext(
 	     * after initialization, so we panic.
 	     */
 
-	    Tcl_Panic("TclSetAppContext: multiple application contexts");
+	    Tcl_Panic("TclSetAppContext:  multiple application contexts");
 	}
     } else {
 	/*
@@ -181,13 +178,7 @@ TclSetAppContext(
 void
 InitNotifier(void)
 {
-    static const Tcl_NotifierProcs np =
-	SetTimer,
-	WaitForEvent,
-	CreateFileHandler,
-	DeleteFileHandler,
-	NULL, NULL, NULL, NULL
-    };
+    Tcl_NotifierProcs np;
 
     /*
      * Only reinitialize if we are not in exit handling. The notifier can get
@@ -199,6 +190,14 @@ InitNotifier(void)
 	return;
     }
 
+    np.createFileHandlerProc = CreateFileHandler;
+    np.deleteFileHandlerProc = DeleteFileHandler;
+    np.setTimerProc = SetTimer;
+    np.waitForEventProc = WaitForEvent;
+    np.initNotifierProc = Tcl_InitNotifier;
+    np.finalizeNotifierProc = Tcl_FinalizeNotifier;
+    np.alertNotifierProc = Tcl_AlertNotifier;
+    np.serviceModeHookProc = Tcl_ServiceModeHook;
     Tcl_SetNotifier(&np);
 
     /*
@@ -207,6 +206,7 @@ InitNotifier(void)
      */
 
     initialized = 1;
+    memset(&np, 0, sizeof(np));
     Tcl_CreateExitHandler(NotifierExitHandler, NULL);
 }
 
@@ -229,7 +229,7 @@ InitNotifier(void)
 
 static void
 NotifierExitHandler(
-    TCL_UNUSED(void *))
+    ClientData clientData)	/* Not used. */
 {
     if (notifier.currentTimeout != 0) {
 	XtRemoveTimeOut(notifier.currentTimeout);
@@ -263,7 +263,7 @@ NotifierExitHandler(
 
 static void
 SetTimer(
-    const Tcl_Time *timePtr)		/* Timeout value, may be NULL. */
+    Tcl_Time *timePtr)		/* Timeout value, may be NULL. */
 {
     long timeout;
 
@@ -302,7 +302,7 @@ SetTimer(
 
 static void
 TimerProc(
-    TCL_UNUSED(XtPointer),
+    XtPointer clientData, /* Not used. */
     XtIntervalId *id)
 {
     if (*id != notifier.currentTimeout) {
@@ -339,7 +339,7 @@ CreateFileHandler(
 				 * called. */
     Tcl_FileProc *proc,		/* Procedure to call for each selected
 				 * event. */
-    void *clientData)	/* Arbitrary data to pass to proc. */
+    ClientData clientData)	/* Arbitrary data to pass to proc. */
 {
     FileHandler *filePtr;
 
@@ -356,7 +356,7 @@ CreateFileHandler(
 	}
     }
     if (filePtr == NULL) {
-	filePtr = (FileHandler *) ckalloc(sizeof(FileHandler));
+	filePtr = (FileHandler*) ckalloc(sizeof(FileHandler));
 	filePtr->fd = fd;
 	filePtr->read = 0;
 	filePtr->write = 0;
@@ -467,7 +467,7 @@ DeleteFileHandler(
     if (filePtr->mask & TCL_EXCEPTION) {
 	XtRemoveInput(filePtr->except);
     }
-    ckfree(filePtr);
+    ckfree((char *) filePtr);
 }
 
 /*
@@ -493,7 +493,7 @@ FileProc(
     int *fd,
     XtInputId *id)
 {
-    FileHandler *filePtr = (FileHandler *) clientData;
+    FileHandler *filePtr = (FileHandler *)clientData;
     FileHandlerEvent *fileEvPtr;
     int mask = 0;
 
@@ -598,7 +598,7 @@ FileHandlerEventProc(
 	mask = filePtr->readyMask & filePtr->mask;
 	filePtr->readyMask = 0;
 	if (mask != 0) {
-	    filePtr->proc(filePtr->clientData, mask);
+	    (*filePtr->proc)(filePtr->clientData, mask);
 	}
 	break;
     }
@@ -627,7 +627,7 @@ FileHandlerEventProc(
 
 static int
 WaitForEvent(
-    const Tcl_Time *timePtr)		/* Maximum block time, or NULL. */
+    Tcl_Time *timePtr)		/* Maximum block time, or NULL. */
 {
     int timeout;