Revert "begin to remove SkLONGLONG and wean Skia off of Sk64"

include/core/SkPostConfig.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPostConfig_DEFINED
 #define SkPostConfig_DEFINED
 
@@ skipping 209 matching lines @@
 #else
 #  define SK_PMCOLOR_BYTE_ORDER(C0, C1, C2, C3)     \
         (SK_ ## C0 ## 32_SHIFT == 0  &&             \
          SK_ ## C1 ## 32_SHIFT == 8  &&             \
          SK_ ## C2 ## 32_SHIFT == 16 &&             \
          SK_ ## C3 ## 32_SHIFT == 24)
 #endif
 
 //////////////////////////////////////////////////////////////////////
 
-// TODO: rebaseline as needed so we can remove this flag entirely.
-//  - all platforms have int64_t now
-//  - we have slightly different fixed math results because of this check
-//    since we don't define this for linux/android
 #if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC)
 #  ifndef SkLONGLONG
-#    define SkLONGLONG int64_t
+#    ifdef SK_BUILD_FOR_WIN32
+#      define SkLONGLONG __int64
+#    else
+#      define SkLONGLONG long long
+#    endif
 #  endif
 #endif
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 #ifndef SK_BUILD_FOR_WINCE
 #  include <string.h>
 #  include <stdlib.h>
 #else
 #  define _CMNINTRIN_DECLARE_ONLY
 #  include "cmnintrin.h"
@@ skipping 138 matching lines @@
 
 #ifndef SK_MUTEX_PLATFORM_H
 #  if defined(SK_BUILD_FOR_WIN)
 #    define SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_win.h"
 #  else
 #    define SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"
 #  endif
 #endif
 
 #endif // SkPostConfig_DEFINED