-Werror fixes from D'Arcy.

diff --git a/src/bin/pgtclsh/pgtclAppInit.c b/src/bin/pgtclsh/pgtclAppInit.c
index acdce124f8dce672b9af1763e41ef2e2f3674107..b44a46f681199b3958f197606126fe902c8314a3 100644 (file)
--- a/src/bin/pgtclsh/pgtclAppInit.c
+++ b/src/bin/pgtclsh/pgtclAppInit.c
@@ -11,11 +11,7 @@
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#) tclAppInit.c 1.11 94/12/17 16:14:03";
-#endif /* not lint */
-
-#include "tcl.h"
+#include <tcl.h>
 
 #include <libpgtcl.h>
 
@@ -47,9 +43,7 @@ int *tclDummyMathPtr = (int *) matherr;
  */
 
 int
-main(argc, argv)
-    int argc;                  /* Number of command-line arguments. */
-    char **argv;               /* Values of command-line arguments. */
+main(int argc, char **argv)
 {
     Tcl_Main(argc, argv, Tcl_AppInit);
     return 0;                  /* Needed only to prevent compiler warning. */
@@ -75,8 +69,7 @@ main(argc, argv)
  */
 
 int
-Tcl_AppInit(interp)
-    Tcl_Interp *interp;                /* Interpreter for application. */
+Tcl_AppInit(Tcl_Interp *interp)
 {
     if (Tcl_Init(interp) == TCL_ERROR) {
        return TCL_ERROR;
@@ -93,7 +86,7 @@ Tcl_AppInit(interp)
      * where "Mod" is the name of the module.
      */
 
-    if (Pg_Init(interp) == TCL_ERROR) { 
+    if (Pgtcl_Init(interp) == TCL_ERROR) { 
       return TCL_ERROR;
     }
 

diff --git a/src/bin/pgtclsh/pgtkAppInit.c b/src/bin/pgtclsh/pgtkAppInit.c
index 044b6790dac9535cfc3adefb00c0b146b5c84d61..5be20ec589cb0b6792acb30e452a5356d7ca4eea 100644 (file)
--- a/src/bin/pgtclsh/pgtkAppInit.c
+++ b/src/bin/pgtclsh/pgtkAppInit.c
@@ -11,10 +11,6 @@
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#) tkAppInit.c 1.12 94/12/17 16:30:56";
-#endif /* not lint */
-
 #include "tk.h"
 #include "libpgtcl.h"
 
@@ -46,9 +42,7 @@ int *tclDummyMathPtr = (int *) matherr;
  */
 
 int
-main(argc, argv)
-    int argc;                  /* Number of command-line arguments. */
-    char **argv;               /* Values of command-line arguments. */
+main(int argc, char **argv)
 {
     Tk_Main(argc, argv, Tcl_AppInit);
     return 0;                  /* Needed only to prevent compiler warning. */
@@ -74,11 +68,8 @@ main(argc, argv)
  */
 
 int
-Tcl_AppInit(interp)
-    Tcl_Interp *interp;                /* Interpreter for application. */
+Tcl_AppInit(Tcl_Interp *interp)
 {
-    Tk_Window main;
-
     if (Tcl_Init(interp) == TCL_ERROR) {
        return TCL_ERROR;
     }
@@ -97,7 +88,7 @@ Tcl_AppInit(interp)
      * where "Mod" is the name of the module.
      */
 
-    if (Pg_Init(interp) == TCL_ERROR) { 
+    if (Pgtcl_Init(interp) == TCL_ERROR) { 
       return TCL_ERROR;
     }
     /*