Fix windows build.

Windows won't let me insert #ifdefs inside macro expansion.

R=borenet@google.com
TBR=borenet
NOTRY=true

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/289853003

git-svn-id: http://skia.googlecode.com/svn/trunk@14769 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 8df0ab1..c65e1e7 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -30,12 +30,16 @@
 
 DEFINE_int32(threads, -1, "Threads for CPU work. Default NUM_CPUS.");
 DEFINE_int32(gpuThreads, 1, "Threads for GPU work.");
+#ifdef SK_BUILD_JSON_WRITER
 DEFINE_string2(expectations, r, "",
                "If a directory, compare generated images against images under this path. "
-#ifdef SK_BUILD_JSON_WRITER
                "If a file, compare generated images against JSON expectations at this path."
-#endif
 );
+#else
+DEFINE_string2(expectations, r, "",
+               "If a directory, compare generated images against images under this path. "
+);
+#endif
 DEFINE_string2(resources, i, "resources", "Path to resources directory.");
 DEFINE_string(match, "",  "[~][^]substring[$] [...] of GM name to run.\n"
                           "Multiple matches may be separated by spaces.\n"