Removing warnings discovered by gcc -Wall

diff --git a/Modules/audioop.c b/Modules/audioop.c
index 8d251892c5276177412039c654499e75fa52c665..49cd8c95753143f37f6b98aac280ea2e92277225 100644 (file)
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -87,7 +87,7 @@ static int ulaw_table[256] = {
        120,    112,    104,     96,     88,     80,     72,     64,
        56,     48,     40,     32,     24,     16,      8,      0 };
 
-/* #define ZEROTRAP    /* turn on the trap as per the MIL-STD */
+/* #define ZEROTRAP */   /* turn on the trap as per the MIL-STD */
 #define BIAS 0x84   /* define the add-in bias for 16 bit samples */
 #define CLIP 32635
 

diff --git a/Modules/tkappinit.c b/Modules/tkappinit.c
index 52874469dffe8f81997da01f8ac9899f2957a60f..c551fcab44d5c5e2b22149c1a3ceb49ad2eca6a1 100644 (file)
--- a/Modules/tkappinit.c
+++ b/Modules/tkappinit.c
@@ -18,14 +18,14 @@
 int
 Tcl_AppInit(Tcl_Interp *interp)
 {
-       Tk_Window main;
+       Tk_Window main_window;
 
        if (Tcl_Init (interp) == TCL_ERROR)
                return TCL_ERROR;
        if (Tk_Init (interp) == TCL_ERROR)
                return TCL_ERROR;
 
-       main = Tk_MainWindow(interp);
+       main_window = Tk_MainWindow(interp);
 
 #ifdef WITH_MOREBUTTONS
        {
@@ -33,9 +33,9 @@ Tcl_AppInit(Tcl_Interp *interp)
                extern Tcl_CmdProc triButtonCmd;
 
                Tcl_CreateCommand(interp, "studbutton", studButtonCmd,
-                                 (ClientData) main, NULL);
+                                 (ClientData) main_window, NULL);
                Tcl_CreateCommand(interp, "tributton", triButtonCmd,
-                                 (ClientData) main, NULL);
+                                 (ClientData) main_window, NULL);
        }
 #endif