Author: mikej Date: Sat Feb 16 22:30:42 2008 New Revision: 7647 Modified: freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj freeswitch/trunk/libs/voipcodecs/src/voipcodecs/dc_restore.h Log: msvc build. Modified: freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj ============================================================================== --- freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj (original) +++ freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj Sat Feb 16 22:30:42 2008 @@ -20,7 +20,7 @@ Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" + ConfigurationType="4" CharacterSet="1" > <Tool @@ -48,7 +48,6 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" - Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> <Tool @@ -61,22 +60,12 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" - LinkIncremental="2" - ModuleDefinitionFile="src/msvc/voipcodecs.def" - GenerateDebugInformation="true" - SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" + Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool - Name="VCManifestTool" - /> - <Tool Name="VCXDCMakeTool" /> <Tool @@ -86,9 +75,6 @@ Name="VCFxCopTool" /> <Tool - Name="VCAppVerifierTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> @@ -96,7 +82,7 @@ Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" + ConfigurationType="4" CharacterSet="1" WholeProgramOptimization="1" > @@ -122,7 +108,6 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" - Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -135,24 +120,12 @@ Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" - LinkIncremental="1" - ModuleDefinitionFile="src/msvc/voipcodecs.def" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" - TargetMachine="1" + Name="VCLibrarianTool" /> <Tool Name="VCALinkTool" /> <Tool - Name="VCManifestTool" - /> - <Tool Name="VCXDCMakeTool" /> <Tool @@ -162,9 +135,6 @@ Name="VCFxCopTool" /> <Tool - Name="VCAppVerifierTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> Modified: freeswitch/trunk/libs/voipcodecs/src/voipcodecs/dc_restore.h ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/voipcodecs/dc_restore.h (original) +++ freeswitch/trunk/libs/voipcodecs/src/voipcodecs/dc_restore.h Sat Feb 16 22:30:42 2008 @@ -99,6 +99,35 @@ } /*- End of function --------------------------------------------------------*/ +#ifdef _MSC_VER +__inline float rintf (float flt) +{ + _asm + { fld flt + frndint + } +} + +__inline double rint(double dbl) +{ + __asm + { + fld dbl + frndint + } +} + +__inline long lrintf (float flt) +{ + long retval; + _asm + { fld flt + fistp retval + } + return retval; +} +#endif + static __inline__ int16_t fsaturatef(float famp) { if (famp > 32767.0)