Fixes for compilation with gcc 15

[micropolis] / src / sim / w_inter.c

diff --git a/src/sim/w_inter.c b/src/sim/w_inter.c
index 33e77716ca13a2afd269be2fef269e6bd4738399..06bf44c7511438a0677b18da318f5f7a67308a83 100644 (file)
--- a/src/sim/w_inter.c
+++ b/src/sim/w_inter.c
@@ -295,6 +295,8 @@ static void         TrackInterval _ANSI_ARGS_((Interval *intervalPtr,
 static void            StartTrackInterval _ANSI_ARGS_((Interval *intervalPtr,
                            int value));
 static int             ValueToPixel _ANSI_ARGS_((Interval *intervalPtr, int value));
 static void            StartTrackInterval _ANSI_ARGS_((Interval *intervalPtr,
                            int value));
 static int             ValueToPixel _ANSI_ARGS_((Interval *intervalPtr, int value));

+
+static void            NotifyInterval(register Interval *intervalPtr);

 \f
 /*
  *--------------------------------------------------------------
 \f
 /*
  *--------------------------------------------------------------


@@ -314,13 +316,14 @@ static int                ValueToPixel _ANSI_ARGS_((Interval *intervalPtr, int value));
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-int
-Tk_IntervalCmd(clientData, interp, argc, argv)
-    ClientData clientData;             /* Main window associated with
+int 
+Tk_IntervalCmd (
+    ClientData clientData,             /* Main window associated with

                                 * interpreter. */
                                 * interpreter. */

-    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. */
+)

 {
     Tk_Window tkwin = (Tk_Window) clientData;
     register Interval *intervalPtr;
 {
     Tk_Window tkwin = (Tk_Window) clientData;
     register Interval *intervalPtr;


@@ -367,7 +370,7 @@ Tk_IntervalCmd(clientData, interp, argc, argv)
            |PointerMotionMask|ButtonPressMask|ButtonReleaseMask,
            IntervalMouseProc, (ClientData) intervalPtr);
     Tcl_CreateCommand(interp, Tk_PathName(intervalPtr->tkwin), IntervalWidgetCmd,
            |PointerMotionMask|ButtonPressMask|ButtonReleaseMask,
            IntervalMouseProc, (ClientData) intervalPtr);
     Tcl_CreateCommand(interp, Tk_PathName(intervalPtr->tkwin), IntervalWidgetCmd,

-           (ClientData) intervalPtr, (void (*)()) NULL);
+           (ClientData) intervalPtr, (void (*)(int *)) NULL);

     if (ConfigureInterval(interp, intervalPtr, argc-2, argv+2, 0) != TCL_OK) {
        goto error;
     }
     if (ConfigureInterval(interp, intervalPtr, argc-2, argv+2, 0) != TCL_OK) {
        goto error;
     }


@@ -398,13 +401,14 @@ Tk_IntervalCmd(clientData, interp, argc, argv)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static int
-IntervalWidgetCmd(clientData, interp, argc, argv)
-    ClientData clientData;             /* Information about interval
+static int 
+IntervalWidgetCmd (
+    ClientData clientData,             /* Information about interval

                                         * widget. */
                                         * widget. */

-    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. */
+)

 {
     register Interval *intervalPtr = (Interval *) clientData;
     int result = TCL_OK;
 {
     register Interval *intervalPtr = (Interval *) clientData;
     int result = TCL_OK;


@@ -513,9 +517,10 @@ IntervalWidgetCmd(clientData, interp, argc, argv)
  *----------------------------------------------------------------------
  */
 
  *----------------------------------------------------------------------
  */
 

-static void
-DestroyInterval(clientData)
-    ClientData clientData;     /* Info about interval widget. */
+static void 
+DestroyInterval (
+    ClientData clientData      /* Info about interval widget. */
+)

 {
     register Interval *intervalPtr = (Interval *) clientData;
 
 {
     register Interval *intervalPtr = (Interval *) clientData;
 


@@ -570,14 +575,15 @@ DestroyInterval(clientData)
  *----------------------------------------------------------------------
  */
 
  *----------------------------------------------------------------------
  */
 

-static int
-ConfigureInterval(interp, intervalPtr, argc, argv, flags)
-    Tcl_Interp *interp;                /* Used for error reporting. */
-    register Interval *intervalPtr;    /* Information about widget;  may or may
+static int 
+ConfigureInterval (
+    Tcl_Interp *interp,                /* Used for error reporting. */
+    register Interval *intervalPtr,    /* Information about widget;  may or may

                                 * not already have values for some fields. */
                                 * not already have values for some fields. */

-    int argc;                  /* Number of valid entries in argv. */
-    char **argv;               /* Arguments. */
-    int flags;                 /* Flags to pass to Tk_ConfigureWidget. */
+    int argc,                  /* Number of valid entries in argv. */
+    char **argv,               /* Arguments. */
+    int flags                  /* Flags to pass to Tk_ConfigureWidget. */
+)

 {
     XGCValues gcValues;
     GC newGC;
 {
     XGCValues gcValues;
     GC newGC;


@@ -688,9 +694,10 @@ ConfigureInterval(interp, intervalPtr, argc, argv, flags)
  *----------------------------------------------------------------------
  */
 
  *----------------------------------------------------------------------
  */
 

-static void
-ComputeIntervalGeometry(intervalPtr)
-    register Interval *intervalPtr;            /* Information about widget. */
+static void 
+ComputeIntervalGeometry (
+    register Interval *intervalPtr             /* Information about widget. */
+)

 {
     XCharStruct bbox;
     char valueString[30];
 {
     XCharStruct bbox;
     char valueString[30];


@@ -792,14 +799,15 @@ ComputeIntervalGeometry(intervalPtr)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static void
-DisplayVerticalInterval(clientData)
-    ClientData clientData;     /* Information about widget. */
+static void 
+DisplayVerticalInterval (
+    ClientData clientData      /* Information about widget. */
+)

 {
     register Interval *intervalPtr = (Interval *) clientData;
     register Tk_Window tkwin = intervalPtr->tkwin;
     int tickRightEdge, valueRightEdge, labelLeftEdge, intervalLeftEdge;
 {
     register Interval *intervalPtr = (Interval *) clientData;
     register Tk_Window tkwin = intervalPtr->tkwin;
     int tickRightEdge, valueRightEdge, labelLeftEdge, intervalLeftEdge;

-    int totalPixels, x, y, width, height, tickValue, min, max;
+    int totalPixels, x, width, height, tickValue, min, max;

     int relief;
     Tk_3DBorder sliderBorder;
 
     int relief;
     Tk_3DBorder sliderBorder;
 


@@ -951,15 +959,16 @@ DisplayVerticalInterval(clientData)
  *----------------------------------------------------------------------
  */
 
  *----------------------------------------------------------------------
  */
 

-static void
-DisplayVerticalValue(intervalPtr, value, rightEdge)
-    register Interval *intervalPtr;    /* Information about widget in which to
+static void 
+DisplayVerticalValue (
+    register Interval *intervalPtr,    /* Information about widget in which to

                                 * display value. */
                                 * display value. */

-    int value;                 /* Y-coordinate of number to display,
+    int value,                 /* Y-coordinate of number to display,

                                 * specified in application coords, not
                                 * in pixels (we'll compute pixels). */
                                 * specified in application coords, not
                                 * in pixels (we'll compute pixels). */

-    int rightEdge;             /* X-coordinate of right edge of text,
+    int rightEdge              /* X-coordinate of right edge of text,

                                 * specified in pixels. */
                                 * specified in pixels. */

+)

 {
     register Tk_Window tkwin = intervalPtr->tkwin;
     int y, dummy, length;
 {
     register Tk_Window tkwin = intervalPtr->tkwin;
     int y, dummy, length;


@@ -1006,14 +1015,15 @@ DisplayVerticalValue(intervalPtr, value, rightEdge)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static void
-DisplayHorizontalInterval(clientData)
-    ClientData clientData;     /* Information about widget. */
+static void 
+DisplayHorizontalInterval (
+    ClientData clientData      /* Information about widget. */
+)

 {
     register Interval *intervalPtr = (Interval *) clientData;
     register Tk_Window tkwin = intervalPtr->tkwin;
     int tickBottom, valueBottom, labelBottom, intervalBottom;
 {
     register Interval *intervalPtr = (Interval *) clientData;
     register Tk_Window tkwin = intervalPtr->tkwin;
     int tickBottom, valueBottom, labelBottom, intervalBottom;

-    int totalPixels, x, y, width, height, tickValue, min, max;
+    int totalPixels, y, width, height, tickValue, min, max;

     int relief;
     Tk_3DBorder sliderBorder;
 
     int relief;
     Tk_3DBorder sliderBorder;
 


@@ -1163,15 +1173,16 @@ DisplayHorizontalInterval(clientData)
  *----------------------------------------------------------------------
  */
 
  *----------------------------------------------------------------------
  */
 

-static void
-DisplayHorizontalValue(intervalPtr, value, bottom)
-    register Interval *intervalPtr;    /* Information about widget in which to
+static void 
+DisplayHorizontalValue (
+    register Interval *intervalPtr,    /* Information about widget in which to

                                 * display value. */
                                 * display value. */

-    int value;                 /* Y-coordinate of number to display,
+    int value,                 /* Y-coordinate of number to display,

                                 * specified in application coords, not
                                 * in pixels (we'll compute pixels). */
                                 * specified in application coords, not
                                 * in pixels (we'll compute pixels). */

-    int bottom;                        /* Y-coordinate of bottom edge of text,
+    int bottom                 /* Y-coordinate of bottom edge of text,

                                 * specified in pixels. */
                                 * specified in pixels. */

+)

 {
     register Tk_Window tkwin = intervalPtr->tkwin;
     int x, y, dummy, length;
 {
     register Tk_Window tkwin = intervalPtr->tkwin;
     int x, y, dummy, length;


@@ -1218,11 +1229,13 @@ DisplayHorizontalValue(intervalPtr, value, bottom)
  *----------------------------------------------------------------------
  */
 
  *----------------------------------------------------------------------
  */
 

-static int
-PixelToValue(intervalPtr, x, y)
-    register Interval *intervalPtr;            /* Information about widget. */
-    int x, y;                          /* Coordinates of point within
+static int 
+PixelToValue (
+    register Interval *intervalPtr,            /* Information about widget. */
+    int x,
+    int y                              /* Coordinates of point within

                                         * window. */
                                         * window. */

+)

 {
     int value, pixelRange;
 
 {
     int value, pixelRange;
 


@@ -1286,10 +1299,11 @@ PixelToValue(intervalPtr, x, y)
  *----------------------------------------------------------------------
  */
 
  *----------------------------------------------------------------------
  */
 

-static int
-ValueToPixel(intervalPtr, value)
-    register Interval *intervalPtr;            /* Information about widget. */
-    int value;                         /* Reading of the widget. */
+static int 
+ValueToPixel (
+    register Interval *intervalPtr,            /* Information about widget. */
+    int value                          /* Reading of the widget. */
+)

 {
     int y, pixelRange, valueRange;
 
 {
     int y, pixelRange, valueRange;
 


@@ -1326,10 +1340,11 @@ ValueToPixel(intervalPtr, value)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static void
-IntervalEventProc(clientData, eventPtr)
-    ClientData clientData;     /* Information about window. */
-    XEvent *eventPtr;          /* Information about event. */
+static void 
+IntervalEventProc (
+    ClientData clientData,     /* Information about window. */
+    XEvent *eventPtr           /* Information about event. */
+)

 {
     Interval *intervalPtr = (Interval *) clientData;
 
 {
     Interval *intervalPtr = (Interval *) clientData;
 


@@ -1372,10 +1387,11 @@ IntervalEventProc(clientData, eventPtr)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static void
-IntervalMouseProc(clientData, eventPtr)
-    ClientData clientData;             /* Information about window. */
-    register XEvent *eventPtr;         /* Information about event. */
+static void 
+IntervalMouseProc (
+    ClientData clientData,             /* Information about window. */
+    register XEvent *eventPtr          /* Information about event. */
+)

 {
     register Interval *intervalPtr = (Interval *) clientData;
 
 {
     register Interval *intervalPtr = (Interval *) clientData;
 


@@ -1432,15 +1448,13 @@ IntervalMouseProc(clientData, eventPtr)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static void
-StartTrackInterval(intervalPtr, value)
-    register Interval *intervalPtr;    /* Info about widget. */
-    int value;                 /* New value for interval.  Gets
+static void 
+StartTrackInterval (
+    register Interval *intervalPtr,    /* Info about widget. */
+    int value                  /* New value for interval.  Gets

                                 * adjusted if it's off the interval. */
                                 * adjusted if it's off the interval. */

+)

 {
 {

-    int result;
-    char string[20];
-

     if ((value < intervalPtr->fromValue)
            ^ (intervalPtr->toValue < intervalPtr->fromValue)) {
        value = intervalPtr->fromValue;
     if ((value < intervalPtr->fromValue)
            ^ (intervalPtr->toValue < intervalPtr->fromValue)) {
        value = intervalPtr->fromValue;


@@ -1462,13 +1476,12 @@ StartTrackInterval(intervalPtr, value)
 }
 
 
 }
 
 

-static void
-TrackInterval(intervalPtr, value)
-    register Interval *intervalPtr;    /* Info about widget. */
-    int value;
+static void 
+TrackInterval (
+    register Interval *intervalPtr,    /* Info about widget. */
+    int value
+)

 {
 {

-    int result;
-    char string[20];

     int min, max, delta, lastmin, lastmax;
 
 
     int min, max, delta, lastmin, lastmax;
 
 


@@ -1507,9 +1520,12 @@ TrackInterval(intervalPtr, value)
 
 
 static void
 
 
 static void

-SetInterval(intervalPtr, min, max, notify)
-    register Interval *intervalPtr;    /* Info about widget. */
-    int min, max, notify;
+SetInterval(
+    register Interval *intervalPtr,    /* Info about widget. */
+    int min,
+    int max,
+    int notify
+)

 {
     if (min > max) {
       int temp = min;
 {
     if (min > max) {
       int temp = min;


@@ -1548,8 +1564,8 @@ SetInterval(intervalPtr, min, max, notify)
 }
 
 
 }
 
 

-NotifyInterval(intervalPtr)
-    register Interval *intervalPtr;    /* Info about widget. */
+static void
+NotifyInterval(register Interval *intervalPtr)

 {
     int result;
     char string[256];
 {
     int result;
     char string[256];


@@ -1583,11 +1599,12 @@ NotifyInterval(intervalPtr)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static void
-EventuallyRedrawInterval(intervalPtr, what)
-    register Interval *intervalPtr;    /* Information about widget. */
-    int what;                  /* What to redraw:  REDRAW_SLIDER
+static void 
+EventuallyRedrawInterval (
+    register Interval *intervalPtr,    /* Information about widget. */
+    int what                   /* What to redraw:  REDRAW_SLIDER

                                 * or REDRAW_ALL. */
                                 * or REDRAW_ALL. */

+)

 {
     if ((what == 0) || (intervalPtr->tkwin == NULL)
            || !Tk_IsMapped(intervalPtr->tkwin)) {
 {
     if ((what == 0) || (intervalPtr->tkwin == NULL)
            || !Tk_IsMapped(intervalPtr->tkwin)) {