summaryrefslogtreecommitdiffstats
path: root/cloud_print
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2014-09-04 18:33:12 -0700
committerNico Weber <thakis@chromium.org>2014-09-05 01:35:50 +0000
commitea993a8549fda789ca41cceb919266931fd353f5 (patch)
treed67c4b909bb44b6b42d024d3f915aa6f53a900e8 /cloud_print
parent9f8fe767920001f734dddc678bad491be8cc363b (diff)
downloadchromium_src-ea993a8549fda789ca41cceb919266931fd353f5.zip
chromium_src-ea993a8549fda789ca41cceb919266931fd353f5.tar.gz
chromium_src-ea993a8549fda789ca41cceb919266931fd353f5.tar.bz2
win/clang: Fix all remaining -Wformat warnings.
We recently switched from building chromium_builder_tests to building everything, this fixes almost all warnings in the ~1000 translation units we weren't compiling before. No behavior change. BUG=82385 R=scottmg@chromium.org TBR=cpu Review URL: https://codereview.chromium.org/543923002 Cr-Commit-Position: refs/heads/master@{#293393}
Diffstat (limited to 'cloud_print')
-rw-r--r--cloud_print/service/service.gyp10
-rw-r--r--cloud_print/virtual_driver/win/install/setup.cc2
2 files changed, 11 insertions, 1 deletions
diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp
index 04d612d..482bc19 100644
--- a/cloud_print/service/service.gyp
+++ b/cloud_print/service/service.gyp
@@ -121,6 +121,16 @@
'secur32.lib',
],
},
+ 'conditions': [
+ ['clang==1', {
+ # atlapp.h contains a global "using namespace WTL;".
+ # TODO: Remove once cloud_print_service.cc no longer depends on
+ # atlapp.h, http://crbug.com/5027
+ 'VCCLCompilerTool': {
+ 'AdditionalOptions': ['-Wno-header-hygiene'],
+ },
+ }],
+ ],
},
},
{
diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc
index 0a0cfe4..588eb6d 100644
--- a/cloud_print/virtual_driver/win/install/setup.cc
+++ b/cloud_print/virtual_driver/win/install/setup.cc
@@ -345,7 +345,7 @@ HRESULT InstallPrinter(void) {
base::string16 port_name;
printer_info.pPortName = const_cast<LPWSTR>(kPortName);
printer_info.Attributes = PRINTER_ATTRIBUTE_DIRECT|PRINTER_ATTRIBUTE_LOCAL;
- printer_info.pPrintProcessor = L"winprint";
+ printer_info.pPrintProcessor = const_cast<LPWSTR>(L"winprint");
HANDLE handle = AddPrinter(NULL, 2, reinterpret_cast<BYTE*>(&printer_info));
if (handle == NULL) {
HRESULT result = GetLastHResult();