aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorelupus <elupus@svn>2010-04-18 21:05:41 +0000
committerelupus <elupus@svn>2010-04-18 21:05:41 +0000
commit27e1ff761cf0508be28bbb53390b5971067d394f (patch)
treeb78b1e29580703a36e58c98cc7759a26cbb9d25e /lib
parent53eedf78fc20729e73930a5865d131e2a31b19a3 (diff)
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
Diffstat (limited to 'lib')
-rw-r--r--lib/enca/lib/common.c1
-rw-r--r--lib/enca/lib/encnames.c2
-rw-r--r--lib/enca/lib/filters.c1
-rw-r--r--lib/enca/lib/guess.c1
-rw-r--r--lib/enca/lib/lang.c2
-rw-r--r--lib/enca/lib/multibyte.c1
-rw-r--r--lib/enca/lib/pair.c1
-rw-r--r--lib/enca/libenca_win32/libenca_win32.vcproj4
-rw-r--r--lib/fribidi/libfridibidi/libfridibidi.vcproj16
-rw-r--r--lib/libcdio/lib/driver/portable.h4
-rw-r--r--lib/libcdio/lib/paranoia/p_block.h5
-rw-r--r--lib/libcdio/libcdio.vcproj4
-rw-r--r--lib/libiconv/libiconv_win32/libiconv_win32.vcproj16
-rw-r--r--lib/pcre/libpcre/libpcre.vcproj12
14 files changed, 31 insertions, 39 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>