From a580c31122cd83724ce6d26447081ad6f77275ce Mon Sep 17 00:00:00 2001 From: Robert Jongbloed Date: Tue, 4 Sep 2012 15:20:25 +1000 Subject: [PATCH] Fixed VS2010 issues building mod_opal --- src/mod/endpoints/mod_opal/mod_opal.cpp | 4 ++-- src/mod/endpoints/mod_opal/mod_opal.h | 8 ++++---- src/mod/endpoints/mod_opal/mod_opal_2010.vcxproj | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/mod/endpoints/mod_opal/mod_opal.cpp b/src/mod/endpoints/mod_opal/mod_opal.cpp index a8b4b70561..8f72dda4e2 100644 --- a/src/mod/endpoints/mod_opal/mod_opal.cpp +++ b/src/mod/endpoints/mod_opal/mod_opal.cpp @@ -31,7 +31,7 @@ /* FreeSWITCH does not correctly handle an H.323 subtely, that is that a - MAXIMUM audio frames per packet is nototiated, and there is no + MAXIMUM audio frames per packet is negotiated, and there is no requirement for the remote to actually send that many. So, in say GSM, we negotiate up to 3 frames or 60ms of data and the remote actually sends one (20ms) frame per packet. Perfectly legal but blows up the media handling @@ -101,7 +101,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_opal_load) /* Prevent the loading of OPAL codecs via "plug ins", this is a directory full of DLLs that will be loaded automatically. */ - putenv((char *)"PTLIBPLUGINDIR=/no/thanks"); + (void)putenv((char *)"PTLIBPLUGINDIR=/no/thanks"); *module_interface = switch_loadable_module_create_module_interface(pool, modname); diff --git a/src/mod/endpoints/mod_opal/mod_opal.h b/src/mod/endpoints/mod_opal/mod_opal.h index 2b7a553d51..25dbef45d6 100644 --- a/src/mod/endpoints/mod_opal/mod_opal.h +++ b/src/mod/endpoints/mod_opal/mod_opal.h @@ -50,11 +50,11 @@ #undef strncasecmp -#if _MSC_VER < 1600 +#ifdef _MSC_VER /*The following insanity is because libteletone_generate.h defines int8_t in - a slightly different manner to most other cases (SDL, PCAP, Java V8, stdint.h - etc) and does not provide a mechanism to prevent it's inclusion. Then, to - cap it off, VS2008 barfs on the difference. VS2010 seems OK with it. + a slightly different manner to most other cases (SDL, PCAP, Java V8, + VS2010's own stdint.h, etc) and does not provide a mechanism to prevent it's + inclusion. Then, to cap it off, MSVC barfs on the difference. Sigh. */ diff --git a/src/mod/endpoints/mod_opal/mod_opal_2010.vcxproj b/src/mod/endpoints/mod_opal/mod_opal_2010.vcxproj index efe610d5f2..bf38e92ae0 100644 --- a/src/mod/endpoints/mod_opal/mod_opal_2010.vcxproj +++ b/src/mod/endpoints/mod_opal/mod_opal_2010.vcxproj @@ -47,6 +47,7 @@ 4100;4101;%(DisableSpecificWarnings) + true /NODEFAULTLIB:LIMBCTD %(AdditionalOptions)