Removing warnings discovered by gcc -Wall

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
 

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