[Asterisk-cvs] asterisk/codecs/gsm/inc private.h,1.16,1.17

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk/codecs/gsm/inc
In directory mongoose.digium.com:/tmp/cvs-serv7113/codecs/gsm/inc

Modified Files:
	private.h 
Log Message:
fix various compiler warnings


Index: private.h
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/gsm/inc/private.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- private.h	12 Feb 2003 13:59:14 -0000	1.16
+++ private.h	21 Apr 2005 06:30:23 -0000	1.17
@@ -151,13 +151,18 @@
  */
 /* Nonportable, but faster: */
 
-#define	GSM_ADD(a, b)	\
-	((ulongword)((ltmp = (longword)(a) + (longword)(b)) - MIN_WORD) > \
-		MAX_WORD - MIN_WORD ? (ltmp > 0 ? MAX_WORD : MIN_WORD) : ltmp)
+# define GSM_ADD(a, b) ({ \
+		register longword ltmp; \
+		ltmp = (longword) (a) + (longword) (b); \
+		((ulongword) (ltmp - MIN_WORD) > MAX_WORD - MIN_WORD ? \
+			(ltmp > 0 ? MAX_WORD : MIN_WORD) : ltmp); \
+	})
 
-# define GSM_SUB(a, b)	\
-	((ltmp = (longword)(a) - (longword)(b)) >= MAX_WORD \
-	? MAX_WORD : ltmp <= MIN_WORD ? MIN_WORD : ltmp)
+#define GSM_SUB(a, b) ({ \
+		register longword ltmp; \
+		ltmp = (longword) (a) - (longword) (b); \
+		(ltmp >= MAX_WORD ? MAX_WORD : ltmp <= MIN_WORD ? MIN_WORD : ltmp); \
+	})
 
 #endif