changed: reduce compile time warnings about depreciated functions and non safe functions and other things on windows build

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29376 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

33 files changed, 68 insertions, 89 deletions

diff --git a/lib/enca/lib/common.c b/lib/enca/lib/common.c
index cd4ec7250f..e2529d0bbf 100644
--- a/lib/enca/lib/common.c
+++ b/lib/enca/lib/common.c
@@ -22,6 +22,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <stdarg.h>
+#include <string.h>
 
 #include "enca.h"
 #include "internal.h"
diff --git a/lib/enca/lib/encnames.c b/lib/enca/lib/encnames.c
index 1441befce8..6ecb41c9d8 100644
--- a/lib/enca/lib/encnames.c
+++ b/lib/enca/lib/encnames.c
@@ -21,6 +21,8 @@
 #  include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include <string.h>
+
 #include "enca.h"
 #include "internal.h"
 #include "tools/encodings.h"
diff --git a/lib/enca/lib/filters.c b/lib/enca/lib/filters.c
index bd1b887d51..76bb20c0e0 100644
--- a/lib/enca/lib/filters.c
+++ b/lib/enca/lib/filters.c
@@ -22,6 +22,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <math.h>
+#include <string.h>
 
 #include "enca.h"
 #include "internal.h"
diff --git a/lib/enca/lib/guess.c b/lib/enca/lib/guess.c
index 822fe39ea3..4330f4896d 100644
--- a/lib/enca/lib/guess.c
+++ b/lib/enca/lib/guess.c
@@ -22,6 +22,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <math.h>
+#include <string.h>
 
 #include "enca.h"
 #include "internal.h"
diff --git a/lib/enca/lib/lang.c b/lib/enca/lib/lang.c
index 98e27f3493..be89846e34 100644
--- a/lib/enca/lib/lang.c
+++ b/lib/enca/lib/lang.c
@@ -21,6 +21,8 @@
 #  include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include <string.h>
+
 #include "enca.h"
 #include "internal.h"
 
diff --git a/lib/enca/lib/multibyte.c b/lib/enca/lib/multibyte.c
index d0d0680db4..368f406566 100644
--- a/lib/enca/lib/multibyte.c
+++ b/lib/enca/lib/multibyte.c
@@ -22,6 +22,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <math.h>
+#include <string.h>
 
 #include "enca.h"
 #include "internal.h"
diff --git a/lib/enca/lib/pair.c b/lib/enca/lib/pair.c
index 4ab07e7b58..8c52d0115a 100644
--- a/lib/enca/lib/pair.c
+++ b/lib/enca/lib/pair.c
@@ -23,6 +23,7 @@
 
 #include <stdlib.h>
 #include <math.h>
+#include <string.h>
 
 #include "enca.h"
 #include "internal.h"
diff --git a/lib/enca/libenca_win32/libenca_win32.vcproj b/lib/enca/libenca_win32/libenca_win32.vcproj
index 16841d54f1..305d1db7ad 100644
--- a/lib/enca/libenca_win32/libenca_win32.vcproj
+++ b/lib/enca/libenca_win32/libenca_win32.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".\;..\"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -108,7 +108,7 @@
 				EnableIntrinsicFunctions="true"

 				WholeProgramOptimization="false"

 				AdditionalIncludeDirectories=".\;..\"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

diff --git a/lib/fribidi/libfridibidi/libfridibidi.vcproj b/lib/fribidi/libfridibidi/libfridibidi.vcproj
index a5f6a1096b..217c718bfa 100644
--- a/lib/fribidi/libfridibidi/libfridibidi.vcproj
+++ b/lib/fribidi/libfridibidi/libfridibidi.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\;."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -107,7 +107,7 @@
 				Optimization="2"

 				EnableIntrinsicFunctions="true"

 				AdditionalIncludeDirectories="..\;."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

@@ -157,10 +157,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\fribidi_bidi_types.c"

-				>

-			</File>

-			<File

 				RelativePath="..\fribidi_char_sets.c"

 				>

 			</File>

@@ -197,18 +193,10 @@
 				>

 			</File>

 			<File

-				RelativePath="..\fribidi_create_char_types.c"

-				>

-			</File>

-			<File

 				RelativePath="..\fribidi_create_mirroring.c"

 				>

 			</File>

 			<File

-				RelativePath="..\fribidi_main.c"

-				>

-			</File>

-			<File

 				RelativePath="..\fribidi_mem.c"

 				>

 			</File>

diff --git a/lib/libcdio/lib/driver/portable.h b/lib/libcdio/lib/driver/portable.h
index 1f6b52e145..963b18d256 100644
--- a/lib/libcdio/lib/driver/portable.h
+++ b/lib/libcdio/lib/driver/portable.h
@@ -58,7 +58,9 @@
 # endif
 
 # ifndef S_ISCHR
-#  define	_S_IFCHR 0020000	/* character special */
+#  ifndef _S_IFCHR
+#   define	_S_IFCHR 0020000	/* character special */
+#  endif
 #  define S_ISCHR(x) (x & _S_IFCHR)
 # endif
 #endif /*MSVC*/
diff --git a/lib/libcdio/lib/paranoia/p_block.h b/lib/libcdio/lib/paranoia/p_block.h
index 80da687805..ee67ffd757 100644
--- a/lib/libcdio/lib/paranoia/p_block.h
+++ b/lib/libcdio/lib/paranoia/p_block.h
@@ -34,8 +34,13 @@
 #define JIGGLE_MODULO        15     /* sectors */
 #define MIN_SILENCE_BOUNDARY 1024   /* 16 bit words */
 
+#ifndef min
 #define min(x,y) ((x)>(y)?(y):(x))
+#endif
+
+#ifndef max
 #define max(x,y) ((x)<(y)?(y):(x))
+#endif
 
 #include "isort.h"
 
diff --git a/lib/libcdio/libcdio.vcproj b/lib/libcdio/libcdio.vcproj
index 04a8a99c0a..00eb9a8299 100644
--- a/lib/libcdio/libcdio.vcproj
+++ b/lib/libcdio/libcdio.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="lib\msvc;include;lib;lib\driver;..\..\xbmc\win32;..\libiconv\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;MSVC"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;MSVC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -113,7 +113,7 @@
 				FavorSizeOrSpeed="1"

 				OmitFramePointers="true"

 				AdditionalIncludeDirectories="lib\msvc;include;lib;lib\driver;..\..\xbmc\win32;..\libiconv\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;MSVC"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;MSVC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				EnableEnhancedInstructionSet="1"

diff --git a/lib/libiconv/libiconv_win32/libiconv_win32.vcproj b/lib/libiconv/libiconv_win32/libiconv_win32.vcproj
index 10a8cbbc6e..9b4f4364bc 100644
--- a/lib/libiconv/libiconv_win32/libiconv_win32.vcproj
+++ b/lib/libiconv/libiconv_win32/libiconv_win32.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".\;..\include;..\libcharset\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IN_LIBRARY;NO_XMALLOC;ENABLE_RELOCATABLE;set_relocation_prefix=libiconv_set_relocation_prefix;relocate=libiconv_relocate"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IN_LIBRARY;NO_XMALLOC;ENABLE_RELOCATABLE;set_relocation_prefix=libiconv_set_relocation_prefix;relocate=libiconv_relocate;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -108,7 +108,7 @@
 				EnableIntrinsicFunctions="true"

 				WholeProgramOptimization="false"

 				AdditionalIncludeDirectories=".\;..\include;..\libcharset\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IN_LIBRARY;NO_XMALLOC;ENABLE_RELOCATABLE;set_relocation_prefix=libiconv_set_relocation_prefix;relocate=libiconv_relocate"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IN_LIBRARY;NO_XMALLOC;ENABLE_RELOCATABLE;set_relocation_prefix=libiconv_set_relocation_prefix;relocate=libiconv_relocate;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

@@ -154,18 +154,6 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

 			>

 			<File

-				RelativePath="..\lib\genaliases.c"

-				>

-			</File>

-			<File

-				RelativePath="..\lib\genaliases2.c"

-				>

-			</File>

-			<File

-				RelativePath="..\lib\genflags.c"

-				>

-			</File>

-			<File

 				RelativePath="..\lib\iconv.c"

 				>

 			</File>

diff --git a/lib/pcre/libpcre/libpcre.vcproj b/lib/pcre/libpcre/libpcre.vcproj
index 6483119d59..d6b4631d84 100644
--- a/lib/pcre/libpcre/libpcre.vcproj
+++ b/lib/pcre/libpcre/libpcre.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".;..\"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -110,7 +110,7 @@
 				EnableIntrinsicFunctions="true"

 				WholeProgramOptimization="false"

 				AdditionalIncludeDirectories=".;..\"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

@@ -235,10 +235,10 @@
 				>

 			</File>

 			<File

-				RelativePath="..\pcrecpp.cc"
-				>
-			</File>
-			<File
+				RelativePath="..\pcrecpp.cc"

+				>

+			</File>

+			<File

 				RelativePath="..\pcreposix.c"

 				>

 			</File>

diff --git a/project/VS2008Express/UnrarXLib.vcproj b/project/VS2008Express/UnrarXLib.vcproj
index 1b9e781c88..cebf183fb2 100644
--- a/project/VS2008Express/UnrarXLib.vcproj
+++ b/project/VS2008Express/UnrarXLib.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="UnrarXLib"

 	ProjectGUID="{FE0A91C0-E30A-47CD-8A92-A508C9292452}"

 	RootNamespace="UnrarXLib"

@@ -126,7 +126,6 @@
 				PrecompiledHeaderThrough="rar.hpp"

 				PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

 				DisableSpecificWarnings="4800;4018;4146;4996"

 			/>

diff --git a/xbmc/lib/cmyth/Win32/libcmyth.vcproj b/xbmc/lib/cmyth/Win32/libcmyth.vcproj
index 07a766c318..9b7467ca3a 100644
--- a/xbmc/lib/cmyth/Win32/libcmyth.vcproj
+++ b/xbmc/lib/cmyth/Win32/libcmyth.vcproj
@@ -50,8 +50,7 @@
 				UsePrecompiledHeader="0"

 				ProgramDataBaseFileName="$(OutDir)/libcmythd.pdb"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

+				DebugInformationFormat="3"

 				CompileAs="1"

 			/>

 			<Tool

@@ -126,7 +125,6 @@
 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 				CompileAs="1"

 			/>

diff --git a/xbmc/lib/libRTV/crypt.c b/xbmc/lib/libRTV/crypt.c
index 41e50a7f42..00b36c42e8 100644
--- a/xbmc/lib/libRTV/crypt.c
+++ b/xbmc/lib/libRTV/crypt.c
@@ -172,7 +172,7 @@ int rtv_encrypt(const char * plaintext, u32 plaintext_len,
     /* make up a key and obfuscatory material; get the time */

     key    = rand();

     obfusc = rand();

-    t      = time(NULL);

+    t      = (u32)time(NULL);

 

     p = NULL;//getenv("TIMEOFF");

     if (p)

diff --git a/xbmc/lib/libRTV/libRTV.vcproj b/xbmc/lib/libRTV/libRTV.vcproj
index 16c02a86b6..025366fe50 100644
--- a/xbmc/lib/libRTV/libRTV.vcproj
+++ b/xbmc/lib/libRTV/libRTV.vcproj
@@ -41,7 +41,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="_DEBUG;_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"

+				PreprocessorDefinitions="_DEBUG;_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				BasicRuntimeChecks="3"

 				SmallerTypeCheck="true"

 				RuntimeLibrary="1"

@@ -108,7 +108,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="3"

 				OmitFramePointers="true"

-				PreprocessorDefinitions="NDEBUG;_XBOX;PROFILE;_LIB;_CRT_SECURE_NO_WARNINGS"

+				PreprocessorDefinitions="NDEBUG;_XBOX;PROFILE;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -182,7 +182,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="3"

 				OmitFramePointers="true"

-				PreprocessorDefinitions="NDEBUG;_XBOX;PROFILE;FASTCAP;_LIB;_CRT_SECURE_NO_WARNINGS"

+				PreprocessorDefinitions="NDEBUG;_XBOX;PROFILE;FASTCAP;_LIB;_CRT_SECURE_NO_WARNINGS;;_CRT_NONSTDC_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -257,7 +257,7 @@
 				Optimization="3"

 				FavorSizeOrSpeed="0"

 				OmitFramePointers="true"

-				PreprocessorDefinitions="NDEBUG;_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"

+				PreprocessorDefinitions="NDEBUG;_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;;_CRT_NONSTDC_NO_DEPRECATE"

 				StringPooling="false"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -326,7 +326,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="3"

 				OmitFramePointers="true"

-				PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"

+				PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;;_CRT_NONSTDC_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

diff --git a/xbmc/lib/libXBMS/ccincludes.h b/xbmc/lib/libXBMS/ccincludes.h
index 2be85ac385..e7fa8f6419 100644
--- a/xbmc/lib/libXBMS/ccincludes.h
+++ b/xbmc/lib/libXBMS/ccincludes.h
@@ -53,6 +53,8 @@
 #include <netdb.h>
 #else
 #include <windows.h>
+#include <io.h>
+#include <time.h>
 #define snprintf _snprintf
 #endif /* _XBOX */
 
diff --git a/xbmc/lib/libXBMS/libXBMS/libXBMS.vcproj b/xbmc/lib/libXBMS/libXBMS/libXBMS.vcproj
index ebefa66da4..09f0d99999 100644
--- a/xbmc/lib/libXBMS/libXBMS/libXBMS.vcproj
+++ b/xbmc/lib/libXBMS/libXBMS/libXBMS.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\win32\"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -108,7 +108,7 @@
 				EnableIntrinsicFunctions="true"

 				WholeProgramOptimization="false"

 				AdditionalIncludeDirectories="..\..\..\win32\"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

diff --git a/xbmc/lib/libXDAAP/libXDAAP_win32/libXDAAP_win32.vcproj b/xbmc/lib/libXDAAP/libXDAAP_win32/libXDAAP_win32.vcproj
index 0e6a83feeb..046fcc19d0 100644
--- a/xbmc/lib/libXDAAP/libXDAAP_win32/libXDAAP_win32.vcproj
+++ b/xbmc/lib/libXDAAP/libXDAAP_win32/libXDAAP_win32.vcproj
@@ -42,7 +42,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -106,7 +106,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				BufferSecurityCheck="false"

diff --git a/xbmc/lib/libass/libass_win32/libass_win32_vs2008.vcproj b/xbmc/lib/libass/libass_win32/libass_win32_vs2008.vcproj
index c610a9612b..f6c09663d5 100644
--- a/xbmc/lib/libass/libass_win32/libass_win32_vs2008.vcproj
+++ b/xbmc/lib/libass/libass_win32/libass_win32_vs2008.vcproj
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\..\..\..\lib\libiconv\include;..\..\..\..\lib\fontconfig_win32\include;..\..\..\..\lib\freetype\include\freetype2;..\..\..\..\lib\freetype\include;.\;..\..\..\..\lib\enca\lib;$(NOINHERIT)"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBASS_WIN32_EXPORTS"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBASS_WIN32_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -66,7 +66,7 @@
 				AdditionalDependencies="..\..\..\..\lib\fontconfig_win32\lib\fontconfig.lib"

 				OutputFile="..\..\..\..\system\players\dvdplayer\libass.dll"

 				LinkIncremental="2"

-				IgnoreDefaultLibraryNames=""

+				IgnoreDefaultLibraryNames="LIBCMTD"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile="Debug/libass_win32.pdb"

 				SubSystem="2"

@@ -124,7 +124,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="3"

 				AdditionalIncludeDirectories="..\..\..\..\lib\libiconv\include;..\..\..\..\lib\fontconfig_win32\include;..\..\..\..\lib\freetype\include\freetype2;..\..\..\..\lib\freetype\include;.\;..\..\..\..\lib\enca\lib"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBASS_WIN32_EXPORTS"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBASS_WIN32_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

diff --git a/xbmc/lib/libexif/libexif.vcproj b/xbmc/lib/libexif/libexif.vcproj
index 80102c6e3a..43bd81732b 100644
--- a/xbmc/lib/libexif/libexif.vcproj
+++ b/xbmc/lib/libexif/libexif.vcproj
@@ -48,7 +48,6 @@
 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="4"

 			/>

 			<Tool

@@ -122,7 +121,6 @@
 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -197,7 +195,6 @@
 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

 			<Tool

diff --git a/xbmc/lib/libmms/libmms_win32/msvc++/libmms.vcproj b/xbmc/lib/libmms/libmms_win32/msvc++/libmms.vcproj
index f23c4abe04..4afb6f82aa 100644
--- a/xbmc/lib/libmms/libmms_win32/msvc++/libmms.vcproj
+++ b/xbmc/lib/libmms/libmms_win32/msvc++/libmms.vcproj
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".;../src;&quot;..\..\glib-2.20.4&quot;;&quot;..\..\glib-2.20.4\glib&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -123,7 +123,7 @@
 				InlineFunctionExpansion="0"

 				FavorSizeOrSpeed="1"

 				AdditionalIncludeDirectories=".;../src;&quot;..\..\glib-2.20.4&quot;;&quot;..\..\glib-2.20.4\glib&quot;"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

diff --git a/xbmc/lib/libsamplerate/libsamplerate_win32/libsamplerate_win32.vcproj b/xbmc/lib/libsamplerate/libsamplerate_win32/libsamplerate_win32.vcproj
index c7df7f7ff8..d94f197d9d 100644
--- a/xbmc/lib/libsamplerate/libsamplerate_win32/libsamplerate_win32.vcproj
+++ b/xbmc/lib/libsamplerate/libsamplerate_win32/libsamplerate_win32.vcproj
@@ -49,8 +49,8 @@
 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="4"

+				DisableSpecificWarnings="4244"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -111,9 +111,9 @@
 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 				CompileAs="1"

+				DisableSpecificWarnings="4244"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/xbmc/lib/libshout/argv.c b/xbmc/lib/libshout/argv.c
index e58497bf94..69619964e4 100644
--- a/xbmc/lib/libshout/argv.c
+++ b/xbmc/lib/libshout/argv.c
@@ -28,6 +28,9 @@ Boston, MA 02111-1307, USA.  */
 #endif
 void freeargv (char **vector);
 
+#ifdef _MSC_VER
+#define alloca _alloca
+#endif
 
 #define ISBLANK(ch) ((ch) == ' ' || (ch) == '\t')
 
diff --git a/xbmc/lib/libshout/libshout/libshout.vcproj b/xbmc/lib/libshout/libshout/libshout.vcproj
index 3cd9069aee..189f649e4f 100644
--- a/xbmc/lib/libshout/libshout/libshout.vcproj
+++ b/xbmc/lib/libshout/libshout/libshout.vcproj
@@ -42,13 +42,12 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="regex;..\..\..\cores\paplayer;..\..\..\xbmc\cores\dvdplayer\DVDCodecs;..\..\libiconv;..\..\..\cores\dvdplayer\DVDCodecs\Audio\libmad;..\..\..\..\lib\libiconv\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;XBMC;HAVE_ICONV"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;XBMC;HAVE_ICONV;ANSI_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="4"

 			/>

 			<Tool

@@ -107,11 +106,10 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="regex;..\..\..\cores\paplayer;..\..\..\xbmc\cores\dvdplayer\DVDCodecs;..\..\libiconv;..\..\..\cores\dvdplayer\DVDCodecs\Audio\libmad;..\..\..\..\lib\libiconv\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;XBMC;HAVE_ICONV"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;XBMC;HAVE_ICONV;ANSI_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="0"

 			/>

 			<Tool

diff --git a/xbmc/lib/libshout/list.h b/xbmc/lib/libshout/list.h
index f5102b6cd2..f8ab242a5d 100644
--- a/xbmc/lib/libshout/list.h
+++ b/xbmc/lib/libshout/list.h
@@ -192,7 +192,7 @@ static inline void list_splice_init(struct list_head *list,
  * @member:	the name of the list_struct within the struct.
  */
 #define list_entry(ptr, type, member) \
-	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
+	((type *)((char *)(ptr)-(uintptr_t)(&((type *)0)->member)))
 
 /**
  * list_for_each	-	iterate over a list
diff --git a/xbmc/lib/libsquish/vs7/squish/squish_2008.vcproj b/xbmc/lib/libsquish/vs7/squish/squish_2008.vcproj
index 99742f4806..2d631541c6 100644
--- a/xbmc/lib/libsquish/vs7/squish/squish_2008.vcproj
+++ b/xbmc/lib/libsquish/vs7/squish/squish_2008.vcproj
@@ -50,7 +50,6 @@
 				ForceConformanceInForLoopScope="true"

 				UsePrecompiledHeader="0"

 				WarningLevel="4"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -117,7 +116,6 @@
 				ForceConformanceInForLoopScope="true"

 				UsePrecompiledHeader="0"

 				WarningLevel="4"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

 			<Tool

diff --git a/xbmc/lib/sqLite/sqlite/libsqlite_win32/libsqlite_win32.vcproj b/xbmc/lib/sqLite/sqlite/libsqlite_win32/libsqlite_win32.vcproj
index 32c56d98d7..b267392ab1 100644
--- a/xbmc/lib/sqLite/sqlite/libsqlite_win32/libsqlite_win32.vcproj
+++ b/xbmc/lib/sqLite/sqlite/libsqlite_win32/libsqlite_win32.vcproj
@@ -48,7 +48,6 @@
 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="4"

 				CompileAs="1"

 			/>

@@ -110,7 +109,6 @@
 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 				CompileAs="1"

 			/>

diff --git a/xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcproj b/xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcproj
index d93c5d5631..cc0f6a84b9 100644
--- a/xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcproj
+++ b/xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcproj
@@ -48,7 +48,6 @@
 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="4"

 			/>

 			<Tool

@@ -64,7 +63,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="d3dx9.lib"

 				OutputFile="../../../addons/org.xbmc.addons.dxspectrum/Spectrum_win32dx.vis"

-				LinkIncremental="1"

+				LinkIncremental="2"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(OutDir)/Spectrum_win32dx.pdb"

 				SubSystem="2"

@@ -126,7 +125,6 @@
 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -142,7 +140,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="winmm.lib ws2_32.lib d3dx9.lib"

 				OutputFile="../../../addons/org.xbmc.addons.dxspectrum/Spectrum_win32dx.vis"

-				LinkIncremental="1"

+				LinkIncremental="2"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(OutDir)/Spectrum_win32dx.pdb"

 				SubSystem="2"

diff --git a/xbmc/visualizations/Milkdrop/Plugin.vcproj b/xbmc/visualizations/Milkdrop/Plugin.vcproj
index 753c5c562c..849e5f246d 100644
--- a/xbmc/visualizations/Milkdrop/Plugin.vcproj
+++ b/xbmc/visualizations/Milkdrop/Plugin.vcproj
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=""

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_EXPORTS;HAS_DX;_CRT_SECURE_NO_WARNINGS"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_EXPORTS;HAS_DX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				MinimalRebuild="true"

 				ExceptionHandling="1"

 				BasicRuntimeChecks="3"

@@ -67,7 +67,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="D3dx9.lib"

 				OutputFile="../../../addons/com.nullsoft.milkdrop.xbmc/MilkDrop_win32dx.vis"

-				LinkIncremental="1"

+				LinkIncremental="2"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(OutDir)/Plugin.pdb"

 				SubSystem="2"

@@ -126,7 +126,7 @@
 				Name="VCCLCompilerTool"

 				EnableIntrinsicFunctions="true"

 				AdditionalIncludeDirectories=""

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_EXPORTS;HAS_DX;_CRT_SECURE_NO_WARNINGS"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_EXPORTS;HAS_DX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				RuntimeLibrary="2"

 				EnableEnhancedInstructionSet="1"

 				UsePrecompiledHeader="0"

@@ -146,7 +146,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="D3dx9.lib"

 				OutputFile="../../../addons/com.nullsoft.milkdrop.xbmc/MilkDrop_win32dx.vis"

-				LinkIncremental="1"

+				LinkIncremental="2"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(TargetName).pdb"

 				SubSystem="2"

diff --git a/xbmc/visualizations/WaveForm/Waveform.vcproj b/xbmc/visualizations/WaveForm/Waveform.vcproj
index cf851cd42c..4c4e0bfd20 100644
--- a/xbmc/visualizations/WaveForm/Waveform.vcproj
+++ b/xbmc/visualizations/WaveForm/Waveform.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9.00"

+	Version="9,00"

 	Name="visWaveform"

 	ProjectGUID="{D450FE9A-CE56-4496-B4AB-379094E642F2}"

 	RootNamespace="visWaveform"

@@ -49,7 +49,6 @@
 				RuntimeLibrary="1"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="4"

 			/>

 			<Tool

@@ -126,7 +125,6 @@
 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -142,7 +140,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="opengl32.lib winmm.lib ws2_32.lib glu32.lib"

 				OutputFile="../../addons/vis.waveform/Waveform_win32.vis"

-				LinkIncremental="1"

+				LinkIncremental="2"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				OptimizeReferences="2"

@@ -206,7 +204,6 @@
 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="4"

 			/>

 			<Tool

@@ -222,7 +219,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="opengl32.lib glu32.lib"

 				OutputFile="../../../addons/vis.waveform/Waveform_win32.vis"

-				LinkIncremental="1"

+				LinkIncremental="2"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile="$(OutDir)/Waveform.pdb"

 				SubSystem="2"

@@ -283,7 +280,6 @@
 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -299,7 +295,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="opengl32.lib winmm.lib ws2_32.lib glu32.lib"

 				OutputFile="../../addons/vis.waveform/Waveform_win32.vis"

-				LinkIncremental="1"

+				LinkIncremental="2"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				OptimizeReferences="2"