Fix problems in r293393.

TBR=scottmg@chromium.org Review URL: https://codereview.chromium.org/542973002 Cr-Commit-Position: refs/heads/master@{#293440}
SaschaDeWaal · Sep 5, 2014 · 54d38dc · 54d38dc
1 parent 22796d8
commit 54d38dc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/chrome/installer/gcapi/gcapi_test.cc b/chrome/installer/gcapi/gcapi_test.cc
@@ -25,7 +25,7 @@ void call_statically() {
   if (result_flag_off != result_flag_on)
       printf("Registry key flag is not being set properly.");
 
-  printf("Static call returned result as %ld and reason as %ld.\n",
+  printf("Static call returned result as %d and reason as %ld.\n",
          result_flag_on, reason);
 }
 
@@ -50,7 +50,7 @@ void call_dynamically() {
     if (result_flag_off != result_flag_on)
       printf("Registry key flag is not being set properly.");
 
-    printf("Dynamic call returned result as %d and reason as %d.\n",
+    printf("Dynamic call returned result as %d and reason as %ld.\n",
            result_flag_on, reason);
   } else {
     printf("Couldn't find GoogleChromeCompatibilityCheck() in gcapi_dll.\n");

diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp
@@ -121,16 +121,6 @@
               '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'],
-            },
-          }],
-        ],
       },
     },
     {
@@ -160,6 +150,16 @@
               'secur32.lib',
           ],
         },
+        'conditions': [
+          ['clang==1', {
+            # atlapp.h contains a global "using namespace WTL;".
+            # TODO: Remove once cloud_print_service_config.cc no longer depends
+            # on atlapp.h, http://crbug.com/5027
+            'VCCLCompilerTool': {
+              'AdditionalOptions': ['-Wno-header-hygiene'],
+            },
+          }],
+        ],
       },
     },
     {