From 1599b88355fc786bdc53dd1f19100ba8a3bd49e5 Mon Sep 17 00:00:00 2001 From: aymeric Date: Mon, 1 Dec 2008 15:10:39 +0000 Subject: [PATCH] Fix for vs2008 git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@190 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/mediastreamer2/build/win32native/mediastreamer2.vcproj | 2 +- linphone/mediastreamer2/src/dxfilter.cpp | 2 +- linphone/mediastreamer2/src/winvideods.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linphone/mediastreamer2/build/win32native/mediastreamer2.vcproj b/linphone/mediastreamer2/build/win32native/mediastreamer2.vcproj index def620d03..b2061cbef 100755 --- a/linphone/mediastreamer2/build/win32native/mediastreamer2.vcproj +++ b/linphone/mediastreamer2/build/win32native/mediastreamer2.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\codecs\libresample\include;..\..\..\portaudio\include;"..\..\..\win32-bin\include\baseclasses";"..\..\..\win32-bin\include";.;..\..\..\mediastreamer2\include;..\..\..\oRTP\include;..\..\..\codecs\speex\include;..\..\..\codecs\gsm\inc" - PreprocessorDefinitions="HAVE_DIRECTSHOW;VIDEO_ENABLED;__DIRECTSOUND_ENABLED__;EMULATE_INTTYPES;AMD_HACK;CONF_GRAN_MAX=4;HAVE_SPEEX_NOISE;ICE_TEST;ORTP_INET6;WIN32;_DEBUG;_WINDOWS;_USRDLL;MEDIASTREAMER2_EXPORTS;WINDOW_NATIVE;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="HAVE_DIRECTSHOW;VIDEO_ENABLED;EMULATE_INTTYPES;AMD_HACK;CONF_GRAN_MAX=4;HAVE_SPEEX_NOISE;ICE_TEST;ORTP_INET6;WIN32;_DEBUG;_WINDOWS;_USRDLL;MEDIASTREAMER2_EXPORTS;WINDOW_NATIVE;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/linphone/mediastreamer2/src/dxfilter.cpp b/linphone/mediastreamer2/src/dxfilter.cpp index db3627fc6..3f42b38f3 100644 --- a/linphone/mediastreamer2/src/dxfilter.cpp +++ b/linphone/mediastreamer2/src/dxfilter.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #if !defined(_WIN32_WCE) -#include "qedit.h" +EXTERN_C const CLSID CLSID_NullRenderer; #endif #include "dxfilter.h" diff --git a/linphone/mediastreamer2/src/winvideods.c b/linphone/mediastreamer2/src/winvideods.c index 987d68b2d..a23976bdb 100644 --- a/linphone/mediastreamer2/src/winvideods.c +++ b/linphone/mediastreamer2/src/winvideods.c @@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include "dxfilter.h" -#include +EXTERN_C const CLSID CLSID_NullRenderer; HRESULT AddGraphToRot(IUnknown *pUnkGraph, DWORD *pdwRegister); void RemoveGraphFromRot(DWORD pdwRegister);