diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 18:31:40 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 18:31:40 +0000 |
| commit | 599ace27694b3c27f640e2b8c8b51dd67f58cd05 (patch) | |
| tree | b600cf8b5259193c721fe68e04a77b34fac37132 | |
| parent | dc4e78acfa4989da822482e8789ae6f5824cc995 (diff) | |
| download | chromium_src-599ace27694b3c27f640e2b8c8b51dd67f58cd05.zip chromium_src-599ace27694b3c27f640e2b8c8b51dd67f58cd05.tar.gz chromium_src-599ace27694b3c27f640e2b8c8b51dd67f58cd05.tar.bz2 | |
Fix two issues with Visual Studio 2008.
BUG=1290595
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/internal/essential.vsprops | 2 | ||||
| -rw-r--r-- | sandbox/src/policy_engine_opcodes.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/internal/essential.vsprops b/build/internal/essential.vsprops index f64145e..4125957 100644 --- a/build/internal/essential.vsprops +++ b/build/internal/essential.vsprops @@ -10,7 +10,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(SolutionDir)..;$(SDKIncludes)" - PreprocessorDefinitions="_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN" + PreprocessorDefinitions="_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL" MinimalRebuild="false" ExceptionHandling="0" RuntimeTypeInfo="false" diff --git a/sandbox/src/policy_engine_opcodes.cc b/sandbox/src/policy_engine_opcodes.cc index 6031d4c..5e9ed51 100644 --- a/sandbox/src/policy_engine_opcodes.cc +++ b/sandbox/src/policy_engine_opcodes.cc @@ -299,7 +299,7 @@ EvalResult OpcodeEval<OP_WSTRING_MATCH>(PolicyOpcode* opcode, // Advance the source string to the last successfully evaluated position // according to the match context. source_str = &source_str[context->position]; - int source_len = g_nt.wcslen(source_str); + int source_len = static_cast<int>(g_nt.wcslen(source_str)); if (0 == source_len) { // If we reached the end of the source string there is nothing we can |