diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2009-04-15 14:45:41 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2009-04-15 14:45:41 +0000 |
| commit | b20356ecb30f87a4b7aca162dac946c9710e23f3 (patch) | |
| tree | ee64bc0c440a820e1475ddce5de0e099f0dc6847 /third_party/g7221/common/stl-files/basop32.h | |
| parent | fb257e0aaa5b9b078b57c252acdf69c1ba793513 (diff) | |
Ticket #774:
- Added build config for GNU autoconf & make.
- Fixed some G.722.1 codes for linux & mingw32 targets, e.g: types
defs, collision function name 'round'.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2601 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'third_party/g7221/common/stl-files/basop32.h')
| -rw-r--r-- | third_party/g7221/common/stl-files/basop32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/g7221/common/stl-files/basop32.h b/third_party/g7221/common/stl-files/basop32.h index 7b096454..308f8d32 100644 --- a/third_party/g7221/common/stl-files/basop32.h +++ b/third_party/g7221/common/stl-files/basop32.h @@ -54,7 +54,7 @@ Word32 L_mult (Word16 var1, Word16 var2); /* Long mult, 1 */ Word16 negate (Word16 var1); /* Short negate, 1 */ Word16 extract_h (Word32 L_var1); /* Extract high, 1 */ Word16 extract_l (Word32 L_var1); /* Extract low, 1 */ -Word16 round (Word32 L_var1); /* Round, 1 */ +Word16 itu_round (Word32 L_var1); /* Round, 1 */ Word32 L_mac (Word32 L_var3, Word16 var1, Word16 var2); /* Mac, 1 */ Word32 L_msu (Word32 L_var3, Word16 var1, Word16 var2); /* Msu, 1 */ Word32 L_macNs (Word32 L_var3, Word16 var1, Word16 var2); /* Mac without |