Fixes for compilation with gcc 15

[micropolis] / src / tk / tksend.c

diff --git a/src/tk/tksend.c b/src/tk/tksend.c
index c5c1fc1569f7c66601628fb7d7614334ef231ab0..17ee2a3e438c155501e21e0d81570658b3826de5 100644 (file)
--- a/src/tk/tksend.c
+++ b/src/tk/tksend.c
@@ -165,16 +165,17 @@ static void       TimeoutProc _ANSI_ARGS_((ClientData clientData));
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-int
-Tk_RegisterInterp(interp, name, tkwin)
-    Tcl_Interp *interp;                /* Interpreter associated with name. */
-    char *name;                        /* The name that will be used to
+int 
+Tk_RegisterInterp (
+    Tcl_Interp *interp,                /* Interpreter associated with name. */
+    char *name,                        /* The name that will be used to

                                 * refer to the interpreter in later
                                 * "send" commands.  Must be globally
                                 * unique. */
                                 * refer to the interpreter in later
                                 * "send" commands.  Must be globally
                                 * unique. */

-    Tk_Window tkwin;           /* Token for window associated with
+    Tk_Window tkwin            /* Token for window associated with

                                 * interp;  used to identify display
                                 * for communication.  */
                                 * interp;  used to identify display
                                 * for communication.  */

+)

 {
 #define TCL_MAX_NAME_LENGTH 1000
     char propInfo[TCL_MAX_NAME_LENGTH + 20];
 {
 #define TCL_MAX_NAME_LENGTH 1000
     char propInfo[TCL_MAX_NAME_LENGTH + 20];


@@ -287,13 +288,14 @@ Tk_RegisterInterp(interp, name, tkwin)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-int
-Tk_SendCmd(clientData, interp, argc, argv)
-    ClientData clientData;             /* Information about sender (only
+int 
+Tk_SendCmd (
+    ClientData clientData,             /* Information about sender (only

                                         * dispPtr field is used). */
                                         * dispPtr field is used). */

-    Tcl_Interp *interp;                        /* Current interpreter. */
-    int argc;                          /* Number of arguments. */
-    char **argv;                       /* Argument strings. */
+    Tcl_Interp *interp,                        /* Current interpreter. */
+    int argc,                          /* Number of arguments. */
+    char **argv                        /* Argument strings. */
+)

 {
     RegisteredInterp *senderRiPtr = (RegisteredInterp *) clientData;
     Window w;
 {
     RegisteredInterp *senderRiPtr = (RegisteredInterp *) clientData;
     Window w;


@@ -309,7 +311,7 @@ Tk_SendCmd(clientData, interp, argc, argv)
     register RegisteredInterp *riPtr;
     char *cmd;
     int result;
     register RegisteredInterp *riPtr;
     char *cmd;
     int result;

-    Bool (*prevRestrictProc)();
+    Bool (*prevRestrictProc)(Display *, XEvent *, char *);

     char *prevArg;
     TkWindow *winPtr = senderRiPtr->winPtr;
     TkDisplay *dispPtr = senderRiPtr->dispPtr;
     char *prevArg;
     TkWindow *winPtr = senderRiPtr->winPtr;
     TkDisplay *dispPtr = senderRiPtr->dispPtr;


@@ -511,11 +513,12 @@ Tk_SendCmd(clientData, interp, argc, argv)
  *----------------------------------------------------------------------
  */
 
  *----------------------------------------------------------------------
  */
 

-int
-TkGetInterpNames(interp, tkwin)
-    Tcl_Interp *interp;                /* Interpreter for returning a result. */
-    Tk_Window tkwin;           /* Window whose display is to be used
+int 
+TkGetInterpNames (
+    Tcl_Interp *interp,                /* Interpreter for returning a result. */
+    Tk_Window tkwin            /* Window whose display is to be used

                                 * for the lookup. */
                                 * for the lookup. */

+)

 {
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
     char *regProp, *separator, *name;
 {
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
     char *regProp, *separator, *name;


@@ -598,11 +601,12 @@ TkGetInterpNames(interp, tkwin)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static int
-SendInit(interp, dispPtr)
-    Tcl_Interp *interp;                /* Interpreter to use for error
+static int 
+SendInit (
+    Tcl_Interp *interp,                /* Interpreter to use for error

                                 * reporting. */
                                 * reporting. */

-    register TkDisplay *dispPtr;/* Display to initialize. */
+    register TkDisplay *dispPtr/* Display to initialize. */
+)

 
 {
     XSetWindowAttributes atts;
 
 {
     XSetWindowAttributes atts;


@@ -657,12 +661,12 @@ SendInit(interp, dispPtr)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static Window
-LookupName(dispPtr, name, delete)
-    register TkDisplay *dispPtr;
-                       /* Display whose registry to check. */
-    char *name;                /* Name of an interpreter. */
-    int delete;                /* If non-zero, delete info about name. */
+static Window 
+LookupName (
+    register TkDisplay *dispPtr,
+    char *name,                /* Name of an interpreter. */
+    int delete         /* If non-zero, delete info about name. */
+)

 {
     char *regProp, *entry;
     register char *p;
 {
     char *regProp, *entry;
     register char *p;


@@ -773,10 +777,11 @@ LookupName(dispPtr, name, delete)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static void
-SendEventProc(clientData, eventPtr)
-    ClientData clientData;     /* Display information. */      
-    XEvent *eventPtr;          /* Information about event. */
+static void 
+SendEventProc (
+    ClientData clientData,     /* Display information. */
+    XEvent *eventPtr           /* Information about event. */
+)

 {
     TkDisplay *dispPtr = (TkDisplay *) clientData;
     char *propInfo;
 {
     TkDisplay *dispPtr = (TkDisplay *) clientData;
     char *propInfo;


@@ -993,18 +998,19 @@ SendEventProc(clientData, eventPtr)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static void
-AppendPropCarefully(display, window, property, value, pendingPtr)
-    Display *display;          /* Display on which to operate. */
-    Window window;             /* Window whose property is to
+static void 
+AppendPropCarefully (
+    Display *display,          /* Display on which to operate. */
+    Window window,             /* Window whose property is to

                                 * be modified. */
                                 * be modified. */

-    Atom property;             /* Name of property. */
-    char *value;               /* Characters (null-terminated) to
+    Atom property,             /* Name of property. */
+    char *value,               /* Characters (null-terminated) to

                                 * append to property. */
                                 * append to property. */

-    PendingCommand *pendingPtr;        /* Pending command to mark complete
+    PendingCommand *pendingPtr /* Pending command to mark complete

                                 * if an error occurs during the
                                 * property op.  NULL means just
                                 * ignore the error. */
                                 * if an error occurs during the
                                 * property op.  NULL means just
                                 * ignore the error. */

+)

 {
     Tk_ErrorHandler handler;
 
 {
     Tk_ErrorHandler handler;
 


@@ -1021,10 +1027,11 @@ AppendPropCarefully(display, window, property, value, pendingPtr)
  */
 
        /* ARGSUSED */
  */
 
        /* ARGSUSED */

-static int
-AppendErrorProc(clientData, errorPtr)
-    ClientData clientData;     /* Command to mark complete, or NULL. */
-    XErrorEvent *errorPtr;     /* Information about error. */
+static int 
+AppendErrorProc (
+    ClientData clientData,     /* Command to mark complete, or NULL. */
+    XErrorEvent *errorPtr      /* Information about error. */
+)

 {
     PendingCommand *pendingPtr = (PendingCommand *) clientData;
     register PendingCommand *pcPtr;
 {
     PendingCommand *pendingPtr = (PendingCommand *) clientData;
     register PendingCommand *pcPtr;


@@ -1069,11 +1076,12 @@ AppendErrorProc(clientData, errorPtr)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static void
-TimeoutProc(clientData)
-    ClientData clientData;     /* Information about command that
+static void 
+TimeoutProc (
+    ClientData clientData      /* Information about command that

                                 * has been sent but not yet
                                 * responded to. */
                                 * has been sent but not yet
                                 * responded to. */

+)

 {
     PendingCommand *pcPtr = (PendingCommand *) clientData;
     register PendingCommand *pcPtr2;
 {
     PendingCommand *pcPtr = (PendingCommand *) clientData;
     register PendingCommand *pcPtr2;


@@ -1115,10 +1123,11 @@ TimeoutProc(clientData)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static void
-DeleteProc(clientData)
-    ClientData clientData;     /* Info about registration, passed
+static void 
+DeleteProc (
+    ClientData clientData      /* Info about registration, passed

                                 * as ClientData. */
                                 * as ClientData. */

+)

 {
     RegisteredInterp *riPtr = (RegisteredInterp *) clientData;
     register RegisteredInterp *riPtr2;
 {
     RegisteredInterp *riPtr = (RegisteredInterp *) clientData;
     register RegisteredInterp *riPtr2;


@@ -1159,12 +1168,13 @@ DeleteProc(clientData)
  */
 
     /* ARGSUSED */
  */
 
     /* ARGSUSED */

-static Bool
-SendRestrictProc(display, eventPtr, arg)
-    Display *display;          /* Display from which event arrived. */
-    register XEvent *eventPtr; /* Event that just arrived. */
-    char *arg;                 /* Comunication window in which
+static Bool 
+SendRestrictProc (
+    Display *display,          /* Display from which event arrived. */
+    register XEvent *eventPtr, /* Event that just arrived. */
+    char *arg                  /* Comunication window in which

                                 * we're interested. */
                                 * we're interested. */

+)

 {
     register Tk_Window comm = (Tk_Window) arg;
 
 {
     register Tk_Window comm = (Tk_Window) arg;