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
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 @@
"\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 @@
}
if (!strcmp(argv[i], "--help")) {
usage(argv[0]);
- return NO_ERROR;
+ return kNoError;
}
if (!strcmp(argv[i], "--listfilenames")) {
listFilenames = true;
@@ -1193,20 +1193,20 @@
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 @@
if (failOnMismatches) {
return summary.fNumMismatches;
} else {
- return NO_ERROR;
+ return kNoError;
}
}