diff --git a/lib/asan/asan_mac.cc b/lib/asan/asan_mac.cc
index 0118da8..828dc4a 100644
--- a/lib/asan/asan_mac.cc
+++ b/lib/asan/asan_mac.cc
@@ -295,7 +295,7 @@
      }                                                                        \
      return REAL(dispatch_x_f)(dq, (void*)asan_ctxt,                          \
                                asan_dispatch_call_block_and_release);         \
-   }
+  }
 
 INTERCEPT_DISPATCH_X_F_3(dispatch_async_f)
 INTERCEPT_DISPATCH_X_F_3(dispatch_sync_f)
@@ -336,13 +336,13 @@
 
 // See
 // http://www.opensource.apple.com/source/libdispatch/libdispatch-228.18/src/internal.h
-#define fastpath(x) ((typeof(x))__builtin_expect((long)(x), ~0l))
+#define fastpath(x) ((typeof(x))__builtin_expect((uptr)(x), ~0l))
 
 // See
 // http://www.opensource.apple.com/source/libdispatch/libdispatch-228.18/src/init.c
 static dispatch_block_t _dispatch_Block_copy(dispatch_block_t db) {
   dispatch_block_t rval;
-  if (fastpath(db)) { 
+  if (fastpath(db)) {
     while (!fastpath(rval = Block_copy(db))) {
       sleep(1);
     }