Fix usage of SK_BUILD_* defines.

tools/skpdiff/skpdiff_util.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-#if SK_BUILD_FOR_MAC || SK_BUILD_FOR_UNIX || SK_BUILD_FOR_ANDROID
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID)
 #   include <unistd.h>
 #   include <sys/time.h>
 #   include <dirent.h>
 #endif
 
-#if SK_BUILD_FOR_MAC || SK_BUILD_FOR_UNIX
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX)
 #   include <glob.h>
 #endif
 
-#if SK_BUILD_FOR_MAC
+#if defined(SK_BUILD_FOR_MAC)
 #   include <sys/syslimits.h> // PATH_MAX is here for Macs
 #endif
 
-#if SK_BUILD_FOR_WIN32
+#if defined(SK_BUILD_FOR_WIN32)
 #   include <windows.h>
 #endif
 
 #include <stdlib.h>
 #include <time.h>
 #include "SkOSFile.h"
 #include "skpdiff_util.h"
 
 #if SK_SUPPORT_OPENCL
 const char* cl_error_to_string(cl_int err) {
@@ skipping 45 matching lines @@
         case CL_INVALID_BUFFER_SIZE:             return "CL_INVALID_BUFFER_SIZE";
         case CL_INVALID_MIP_LEVEL:               return "CL_INVALID_MIP_LEVEL";
         default:                                 return "UNKNOWN";
     }
     return "UNKNOWN";
 }
 #endif
 
 // TODO refactor Timer to be used here
 double get_seconds() {
-#if SK_BUILD_FOR_WIN32
+#if defined(SK_BUILD_FOR_WIN32)
     LARGE_INTEGER currentTime;
     LARGE_INTEGER frequency;
     QueryPerformanceCounter(&currentTime);
     QueryPerformanceFrequency(&frequency);
     return (double)currentTime.QuadPart / (double)frequency.QuadPart;
 #elif _POSIX_TIMERS > 0 && defined(CLOCK_REALTIME)
     struct timespec currentTime;
     clock_gettime(CLOCK_REALTIME, &currentTime);
     return currentTime.tv_sec + (double)currentTime.tv_nsec / 1e9;
-#elif SK_BUILD_FOR_MAC || SK_BUILD_FOR_UNIX || SK_BUILD_FOR_ANDROID
+#elif defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID)
     struct timeval currentTime;
     gettimeofday(&currentTime, NULL);
     return currentTime.tv_sec + (double)currentTime.tv_usec / 1e6;
 #else
     return clock() / (double)CLOCKS_PER_SEC;
 #endif
 }
 
 bool get_directory(const char path[], SkTArray<SkString>* entries) {
-#if SK_BUILD_FOR_MAC || SK_BUILD_FOR_UNIX || SK_BUILD_FOR_ANDROID
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID)
     // Open the directory and check for success
     DIR* dir = opendir(path);
     if (NULL == dir) {
         return false;
     }
 
     // Loop through dir entries until there are none left (i.e. readdir returns NULL)
     struct dirent* entry;
     while ((entry = readdir(dir))) {
         // dirent only gives relative paths, we need to join them to the base path to check if they
         // are directories.
         SkString joinedPath = SkOSPath::Join(path, entry->d_name);
 
         // We only care about files
         if (!sk_isdir(joinedPath.c_str())) {
             entries->push_back(SkString(entry->d_name));
         }
     }
 
     closedir(dir);
 
     return true;
-#elif SK_BUILD_FOR_WIN32
+#elif defined(SK_BUILD_FOR_WIN32)
     char pathDirGlob[MAX_PATH];
     size_t pathLength = strlen(path);
     strncpy(pathDirGlob, path, pathLength);
 
     if (path[pathLength - 1] == '/' || path[pathLength - 1] == '\\') {
         SkASSERT(pathLength + 2 <= MAX_PATH);
         pathDirGlob[pathLength] = '*';
         pathDirGlob[pathLength + 1] = '\0';
     } else {
         SkASSERT(pathLength + 3 <= MAX_PATH);
@@ skipping 15 matching lines @@
     } while (FindNextFile(hFind, &findFileData) != 0);
 
     FindClose(hFind);
     return true;
 #else
     return false;
 #endif
 }
 
 bool glob_files(const char globPattern[], SkTArray<SkString>* entries) {
-#if SK_BUILD_FOR_MAC || SK_BUILD_FOR_UNIX
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX)
     // TODO Make sure this works on windows. This may require use of FindNextFile windows function.
     glob_t globBuffer;
     if (glob(globPattern, 0, NULL, &globBuffer) != 0) {
         return false;
     }
 
     // Note these paths are in sorted order by default according to http://linux.die.net/man/3/glob
     // Check under the flag GLOB_NOSORT
     char** paths = globBuffer.gl_pathv;
     while(*paths) {
         entries->push_back(SkString(*paths));
         paths++;
     }
 
     globfree(&globBuffer);
 
     return true;
 #else
     return false;
 #endif
 }
 
 SkString get_absolute_path(const SkString& path) {
-#if SK_BUILD_FOR_MAC || SK_BUILD_FOR_UNIX || SK_BUILD_FOR_ANDROID
+#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID)
     SkString fullPath(PATH_MAX + 1);
     if (realpath(path.c_str(), fullPath.writable_str()) == NULL) {
         fullPath.reset();
     }
     return fullPath;
-#elif SK_BUILD_FOR_WIN32
+#elif defined(SK_BUILD_FOR_WIN32)
     SkString fullPath(MAX_PATH);
     if (_fullpath(fullPath.writable_str(), path.c_str(), MAX_PATH) == NULL) {
         fullPath.reset();
     }
     return fullPath;
 #else
     return SkString();
 #endif
 }