From 7a0ee1a7208ddfe8575d1f1179f66fda2fa99339 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Tue, 28 Apr 2009 19:38:43 +0000 Subject: Ticket #706: Merged branch vs-reorg2 into trunk: - Currently supported platforms are: Win32, WM6 std & pro, WM5 SP & PPC, WM2003 SP & PPC. - Added libpjproject into solution, this is a single 'combo' library that bundles all PJSIP libraries. - Cleaned up most of compile warnings, note that warning level of libgsmcodec has been reduced from 4 to 3. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2660 74dad513-b988-da41-8d7b-12977e46ad98 --- third_party/g7221/common/basic_op.c | 2 +- third_party/g7221/common/basic_op.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'third_party/g7221') diff --git a/third_party/g7221/common/basic_op.c b/third_party/g7221/common/basic_op.c index bf7583a7..d4c1530e 100644 --- a/third_party/g7221/common/basic_op.c +++ b/third_party/g7221/common/basic_op.c @@ -1714,7 +1714,7 @@ Word32 L_msu0 (Word32 L_var3, Word16 var1, Word16 var2) UWord32 LU_shl (UWord32 L_var1, Word16 var2) { Word16 neg_var2; - UWord32 L_var_out; + UWord32 L_var_out = 0; if (var2 <= 0) { diff --git a/third_party/g7221/common/basic_op.h b/third_party/g7221/common/basic_op.h index 93febd1f..fe64a494 100644 --- a/third_party/g7221/common/basic_op.h +++ b/third_party/g7221/common/basic_op.h @@ -15,8 +15,8 @@ #define MAX_16 (Word16)0x7fff #define MIN_16 (Word16)(pj_uint16_t)0x8000 -#define UMAX_32 (Word32)0xffffffffL -#define UMIN_32 (Word32)0x00000000L +#define UMAX_32 (UWord32)0xffffffffL +#define UMIN_32 (UWord32)0x00000000L /*___________________________________________________________________________ | | -- cgit v1.2.3