From 70044cc4964c32e0125e46c3c5f7f82446ddda85 Mon Sep 17 00:00:00 2001
From: "epoger@google.com"
 <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Thu, 12 Jul 2012 18:37:55 +0000
Subject: [PATCH] rename NO_ERROR to kNoError, because Windows defines a
 NO_ERROR macro elsewhere

TBR=rmistry
Review URL: https://codereview.appspot.com/6355100

git-svn-id: http://skia.googlecode.com/svn/trunk@4581 2bbb7eff-a529-9590-31e7-b0007b416f81
---
 tools/skdiff_main.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/skdiff_main.cpp b/tools/skdiff_main.cpp
index c53dcf5..d70027a 100644
--- a/tools/skdiff_main.cpp
+++ b/tools/skdiff_main.cpp
@@ -1108,8 +1108,8 @@ static void usage (char * argv0) {
 "\n");
 }
 
-const int NO_ERROR = 0;
-const int GENERIC_ERROR = -1;
+const int kNoError = 0;
+const int kGenericError = -1;
 
 int main (int argc, char ** argv) {
     DiffMetricProc diffProc = compute_diff_pmcolor;
@@ -1141,7 +1141,7 @@ int main (int argc, char ** argv) {
         }
         if (!strcmp(argv[i], "--help")) {
             usage(argv[0]);
-            return NO_ERROR;
+            return kNoError;
         }
         if (!strcmp(argv[i], "--listfilenames")) {
             listFilenames = true;
@@ -1193,20 +1193,20 @@ int main (int argc, char ** argv) {
                 default:
                     SkDebugf("extra unflagged argument <%s>\n", argv[i]);
                     usage(argv[0]);
-                    return GENERIC_ERROR;
+                    return kGenericError;
             }
         }
 
         SkDebugf("Unrecognized argument <%s>\n", argv[i]);
         usage(argv[0]);
-        return GENERIC_ERROR;
+        return kGenericError;
     }
 
     if (numUnflaggedArguments == 2) {
         outputDir = comparisonDir;
     } else if (numUnflaggedArguments != 3) {
         usage(argv[0]);
-        return GENERIC_ERROR;
+        return kGenericError;
     }
 
     if (!baseDir.endsWith(PATH_DIV_STR)) {
@@ -1267,6 +1267,6 @@ int main (int argc, char ** argv) {
     if (failOnMismatches) {
         return summary.fNumMismatches;
     } else {
-        return NO_ERROR;
+        return kNoError;
     }
 }
-- 
2.7.4