Fixes for compilation with gcc 15

[micropolis] / src / tcl / tclexpr.c

diff --git a/src/tcl/tclexpr.c b/src/tcl/tclexpr.c
index 3be04f3573c14e3bf4ae84546ecc7962c55aa515..8ba86a774b2cd0cd0926add726d7cc038cad7ebf 100644 (file)
--- a/src/tcl/tclexpr.c
+++ b/src/tcl/tclexpr.c
@@ -193,12 +193,13 @@ static int                ExprTopLevel _ANSI_ARGS_((Tcl_Interp *interp,
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static int
-ExprParseString(interp, string, valuePtr)
-    Tcl_Interp *interp;                /* Where to store error message. */
-    char *string;              /* String to turn into value. */
-    Value *valuePtr;           /* Where to store value information. 
+static int 
+ExprParseString (
+    Tcl_Interp *interp,                /* Where to store error message. */
+    char *string,              /* String to turn into value. */
+    Value *valuePtr            /* Where to store value information. 

                                 * Caller must have initialized pv field. */
                                 * Caller must have initialized pv field. */

+)

 {
     register char c;
 
 {
     register char c;
 


@@ -284,15 +285,16 @@ ExprParseString(interp, string, valuePtr)
  *----------------------------------------------------------------------
  */
 
  *----------------------------------------------------------------------
  */
 

-static int
-ExprLex(interp, infoPtr, valuePtr)
-    Tcl_Interp *interp;                        /* Interpreter to use for error
+static int 
+ExprLex (
+    Tcl_Interp *interp,                        /* Interpreter to use for error

                                         * reporting. */
                                         * reporting. */

-    register ExprInfo *infoPtr;                /* Describes the state of the parse. */
-    register Value *valuePtr;          /* Where to store value, if that is
+    register ExprInfo *infoPtr,                /* Describes the state of the parse. */
+    register Value *valuePtr           /* Where to store value, if that is

                                         * what's parsed from string.  Caller
                                         * must have initialized pv field
                                         * correctly. */
                                         * what's parsed from string.  Caller
                                         * must have initialized pv field
                                         * correctly. */

+)

 {
     register char *p, c;
     char *var, *term;
 {
     register char *p, c;
     char *var, *term;


@@ -560,20 +562,21 @@ ExprLex(interp, infoPtr, valuePtr)
  *----------------------------------------------------------------------
  */
 
  *----------------------------------------------------------------------
  */
 

-static int
-ExprGetValue(interp, infoPtr, prec, valuePtr)
-    Tcl_Interp *interp;                        /* Interpreter to use for error
+static int 
+ExprGetValue (
+    Tcl_Interp *interp,                        /* Interpreter to use for error

                                         * reporting. */
                                         * reporting. */

-    register ExprInfo *infoPtr;                /* Describes the state of the parse
+    register ExprInfo *infoPtr,                /* Describes the state of the parse

                                         * just before the value (i.e. ExprLex
                                         * will be called to get first token
                                         * of value). */
                                         * just before the value (i.e. ExprLex
                                         * will be called to get first token
                                         * of value). */

-    int prec;                          /* Treat any un-parenthesized operator
+    int prec,                          /* Treat any un-parenthesized operator

                                         * with precedence <= this as the end
                                         * of the expression. */
                                         * with precedence <= this as the end
                                         * of the expression. */

-    Value *valuePtr;                   /* Where to store the value of the
+    Value *valuePtr                    /* Where to store the value of the

                                         * expression.   Caller must have
                                         * initialized pv field. */
                                         * expression.   Caller must have
                                         * initialized pv field. */

+)

 {
     Interp *iPtr = (Interp *) interp;
     Value value2;                      /* Second operand for current
 {
     Interp *iPtr = (Interp *) interp;
     Value value2;                      /* Second operand for current


@@ -1111,9 +1114,10 @@ ExprGetValue(interp, infoPtr, prec, valuePtr)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static void
-ExprMakeString(valuePtr)
-    register Value *valuePtr;          /* Value to be converted. */
+static void 
+ExprMakeString (
+    register Value *valuePtr           /* Value to be converted. */
+)

 {
     int shortfall;
 
 {
     int shortfall;
 


@@ -1152,13 +1156,14 @@ ExprMakeString(valuePtr)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-static int
-ExprTopLevel(interp, string, valuePtr)
-    Tcl_Interp *interp;                        /* Context in which to evaluate the
+static int 
+ExprTopLevel (
+    Tcl_Interp *interp,                        /* Context in which to evaluate the

                                         * expression. */
                                         * expression. */

-    char *string;                      /* Expression to evaluate. */
-    Value *valuePtr;                   /* Where to store result.  Should
+    char *string,                      /* Expression to evaluate. */
+    Value *valuePtr                    /* Where to store result.  Should

                                         * not be initialized by caller. */
                                         * not be initialized by caller. */

+)

 {
     ExprInfo info;
     int result;
 {
     ExprInfo info;
     int result;


@@ -1204,12 +1209,13 @@ ExprTopLevel(interp, string, valuePtr)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-int
-Tcl_ExprLong(interp, string, ptr)
-    Tcl_Interp *interp;                        /* Context in which to evaluate the
+int 
+Tcl_ExprLong (
+    Tcl_Interp *interp,                        /* Context in which to evaluate the

                                         * expression. */
                                         * expression. */

-    char *string;                      /* Expression to evaluate. */
-    long *ptr;                         /* Where to store result. */
+    char *string,                      /* Expression to evaluate. */
+    long *ptr                          /* Where to store result. */
+)

 {
     Value value;
     int result;
 {
     Value value;
     int result;


@@ -1231,12 +1237,13 @@ Tcl_ExprLong(interp, string, ptr)
     return result;
 }
 
     return result;
 }
 

-int
-Tcl_ExprDouble(interp, string, ptr)
-    Tcl_Interp *interp;                        /* Context in which to evaluate the
+int 
+Tcl_ExprDouble (
+    Tcl_Interp *interp,                        /* Context in which to evaluate the

                                         * expression. */
                                         * expression. */

-    char *string;                      /* Expression to evaluate. */
-    double *ptr;                       /* Where to store result. */
+    char *string,                      /* Expression to evaluate. */
+    double *ptr                        /* Where to store result. */
+)

 {
     Value value;
     int result;
 {
     Value value;
     int result;


@@ -1258,12 +1265,13 @@ Tcl_ExprDouble(interp, string, ptr)
     return result;
 }
 
     return result;
 }
 

-int
-Tcl_ExprBoolean(interp, string, ptr)
-    Tcl_Interp *interp;                        /* Context in which to evaluate the
+int 
+Tcl_ExprBoolean (
+    Tcl_Interp *interp,                        /* Context in which to evaluate the

                                         * expression. */
                                         * expression. */

-    char *string;                      /* Expression to evaluate. */
-    int *ptr;                          /* Where to store 0/1 result. */
+    char *string,                      /* Expression to evaluate. */
+    int *ptr                           /* Where to store 0/1 result. */
+)

 {
     Value value;
     int result;
 {
     Value value;
     int result;


@@ -1304,11 +1312,12 @@ Tcl_ExprBoolean(interp, string, ptr)
  *--------------------------------------------------------------
  */
 
  *--------------------------------------------------------------
  */
 

-int
-Tcl_ExprString(interp, string)
-    Tcl_Interp *interp;                        /* Context in which to evaluate the
+int 
+Tcl_ExprString (
+    Tcl_Interp *interp,                        /* Context in which to evaluate the

                                         * expression. */
                                         * expression. */

-    char *string;                      /* Expression to evaluate. */
+    char *string                       /* Expression to evaluate. */
+)

 {
     Value value;
     int result;
 {
     Value value;
     int result;