--- orig/channels/chan_iax2.c	2003-07-29 15:51:11.000000000 -0400
+++ channels/chan_iax2.c	2003-08-04 10:33:33.000000000 -0400
@@ -3528,7 +3528,9 @@
 	struct iax2_peer *peer;
 	int processed = 0;
 	int totalcalls = 0;
+#ifdef ZT_TIMERACK
 	int x = 1;
+#endif		
 	if (iaxtrunkdebug)
 		ast_verbose("Beginning trunk processing\n");
 	if (events & AST_IO_PRI) {
@@ -5050,7 +5052,9 @@
 	int format;
 	struct iax2_user *user;
 	struct iax2_peer *peer;
+#if 0				
 	static unsigned short int last_port=0;
+#endif
 
 	cfg = ast_load(config_file);
 	
--- orig/codecs/gsm/src/decode.c	2003-02-12 08:59:14.000000000 -0500
+++ codecs/gsm/src/decode.c	2003-08-04 15:08:41.000000000 -0400
@@ -22,7 +22,7 @@
 {
 	register int		k;
 	register word		msr = S->msr;
-	register longword	ltmp;	/* for GSM_ADD */
+	//register longword	ltmp;	/* for GSM_ADD */
 	register word		tmp;
 
 	for (k = 160; k--; s++) {
--- orig/codecs/gsm/src/long_term.c	2003-02-12 08:59:14.000000000 -0500
+++ codecs/gsm/src/long_term.c	2003-08-04 15:09:30.000000000 -0400
@@ -852,7 +852,7 @@
  */
 {
 	register int      k;
-	register longword ltmp;
+	//register longword ltmp;
 
 #	undef STEP
 #	define STEP(BP)					\
@@ -921,7 +921,7 @@
  *  table 4.3b.
  */
 {
-	register longword	ltmp;	/* for ADD */
+	//register longword	ltmp;	/* for ADD */
 	register int 		k;
 	word			brp, drpp, Nr;
 
--- orig/codecs/gsm/src/lpc.c	2003-02-12 08:59:14.000000000 -0500
+++ codecs/gsm/src/lpc.c	2003-08-04 15:10:00.000000000 -0400
@@ -211,7 +211,7 @@
 {
 	register int	i, m, n;
 	register word	temp;
-	register longword ltmp;
+	//register longword ltmp;
 	word		ACF[9];	/* 0..8 */
 	word		P[  9];	/* 0..8 */
 	word		K[  9]; /* 2..8 */
@@ -319,7 +319,7 @@
 )
 {
 	register word	temp;
-	longword	ltmp;
+	//longword	ltmp;
 
 
 	/*  This procedure needs four tables; the following equations
--- orig/codecs/gsm/src/preprocess.c	2003-02-12 08:59:14.000000000 -0500
+++ codecs/gsm/src/preprocess.c	2003-08-04 15:11:02.000000000 -0400
@@ -46,8 +46,8 @@
 
 	word		SO;
 
-	longword	ltmp;		/* for   ADD */
-	ulongword	utmp;		/* for L_ADD */
+	//longword	ltmp;		/* for   ADD */
+	//ulongword	utmp;		/* for L_ADD */
 
 	register int		k = 160;
 
@@ -86,7 +86,10 @@
 		/*   Execution of a 31 bv 16 bits multiplication
 		 */
 		{
-		word		msp, lsp;
+		word		msp;
+#ifndef __GNUC__ 
+		word		lsp;
+#endif
 		longword L_s2;
 		longword L_temp;
 		
--- orig/codecs/gsm/src/rpe.c	2003-02-12 08:59:14.000000000 -0500
+++ codecs/gsm/src/rpe.c	2003-08-04 15:11:53.000000000 -0400
@@ -362,7 +362,7 @@
 {
 	int	i;
 	word	temp, temp1, temp2, temp3;
-	longword	ltmp;
+	//longword	ltmp;
 
 	assert( mant >= 0 && mant <= 7 ); 
 
--- orig/codecs/gsm/src/short_term.c	2003-02-12 08:59:14.000000000 -0500
+++ codecs/gsm/src/short_term.c	2003-08-04 15:14:23.000000000 -0400
@@ -30,7 +30,7 @@
 	word	* LARpp)	/* out: decoded ..			*/
 {
 	register word	temp1 /* , temp2 */;
-	register long	ltmp;	/* for GSM_ADD */
+	//register long	ltmp;	/* for GSM_ADD */
 
 	/*  This procedure requires for efficient implementation
 	 *  two tables.
@@ -99,7 +99,7 @@
 	register word * LARp)
 {
 	register int 	i;
-	register longword ltmp;
+	//register longword ltmp;
 
 	for (i = 1; i <= 8; i++, LARp++, LARpp_j_1++, LARpp_j++) {
 		*LARp = GSM_ADD( SASR( *LARpp_j_1, 2 ), SASR( *LARpp_j, 2 ));
@@ -113,7 +113,7 @@
 	register word * LARp)
 {
 	register int i;
-	register longword ltmp;
+	//register longword ltmp;
 	for (i = 1; i <= 8; i++, LARpp_j_1++, LARpp_j++, LARp++) {
 		*LARp = GSM_ADD( SASR( *LARpp_j_1, 1), SASR( *LARpp_j, 1 ));
 	}
@@ -125,7 +125,7 @@
 	register word * LARp)
 {
 	register int i;
-	register longword ltmp;
+	//register longword ltmp;
 
 	for (i = 1; i <= 8; i++, LARpp_j_1++, LARpp_j++, LARp++) {
 		*LARp = GSM_ADD( SASR( *LARpp_j_1, 2 ), SASR( *LARpp_j, 2 ));
@@ -156,7 +156,7 @@
 {
 	register int 		i;
 	register word		temp;
-	register longword	ltmp;
+	//register longword	ltmp;
 
 	for (i = 1; i <= 8; i++, LARp++) {
 
@@ -378,7 +378,7 @@
 	word		* LARpp_j_1	= S->LARpp[ S->j ^= 1 ];
 
 	word		LARp[8];
-int i;
+//int i;
 #undef	FILTER
 #if 	defined(FAST) && defined(USE_FLOAT_MUL)
 # 	define	FILTER 	(* (S->fast			\
--- orig/formats/format_mp3.c	2003-06-28 18:50:47.000000000 -0400
+++ formats/format_mp3.c	2003-08-04 12:12:47.000000000 -0400
@@ -42,7 +42,7 @@
 };
 
 
-static struct ast_filestream *glist = NULL;
+/* static struct ast_filestream *glist = NULL; */
 static pthread_mutex_t mp3_lock = AST_MUTEX_INITIALIZER;
 static int glistcnt = 0;
 
--- orig/res/res_musiconhold.c	2003-07-29 11:38:02.000000000 -0400
+++ res/res_musiconhold.c	2003-08-04 10:31:18.000000000 -0400
@@ -477,7 +477,9 @@
 static int moh_register(char *classname, char *mode, char *param, char *miscargs)
 {
 	struct mohclass *moh;
+#ifdef ZAPATA_MOH
 	int x;
+#endif
 	ast_pthread_mutex_lock(&moh_lock);
 	moh = get_mohbyname(classname);
 	ast_pthread_mutex_unlock(&moh_lock);