Atomics overhaul.

include/ports/SkAtomics_win.h

Index: include/ports/SkAtomics_win.h
diff --git a/include/ports/SkAtomics_win.h b/include/ports/SkAtomics_win.h
deleted file mode 100644
index a1876d269b883be505b130e58ce27a616bc297f9..0000000000000000000000000000000000000000
--- a/include/ports/SkAtomics_win.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkAtomics_win_DEFINED
-#define SkAtomics_win_DEFINED
-
-/** Windows Interlocked atomics. */
-
-#include <intrin.h>
-#include <stdint.h>
-
-//MSDN says in order to declare an interlocked function for use as an
-//intrinsic, include intrin.h and put the function in a #pragma intrinsic
-//directive.
-//The pragma appears to be unnecessary, but doesn't hurt.
-#pragma intrinsic(_InterlockedIncrement, _InterlockedExchangeAdd, _InterlockedDecrement)
-#pragma intrinsic(_InterlockedCompareExchange)
-
-static inline int32_t sk_atomic_inc(int32_t* addr) {
-    // InterlockedIncrement returns the new value, we want to return the old.
-    return _InterlockedIncrement(reinterpret_cast<long*>(addr)) - 1;
-}
-
-static inline int64_t sk_atomic_inc(int64_t* addr) {
-    // InterlockedIncrement returns the new value, we want to return the old.
-    return InterlockedIncrement64(addr) - 1;
-}
-
-static inline int32_t sk_atomic_add(int32_t* addr, int32_t inc) {
-    return _InterlockedExchangeAdd(reinterpret_cast<long*>(addr), static_cast<long>(inc));
-}
-
-static inline int32_t sk_atomic_dec(int32_t* addr) {
-    // InterlockedDecrement returns the new value, we want to return the old.
-    return _InterlockedDecrement(reinterpret_cast<long*>(addr)) + 1;
-}
-
-static inline void sk_membar_acquire__after_atomic_dec() { }
-
-static inline bool sk_atomic_cas(int32_t* addr, int32_t before, int32_t after) {
-    return _InterlockedCompareExchange(reinterpret_cast<long*>(addr), after, before) == before;
-}
-
-static inline void* sk_atomic_cas(void** addr, void* before, void* after) {
-    return InterlockedCompareExchangePointer(addr, after, before);
-}
-
-static inline void sk_membar_acquire__after_atomic_conditional_inc() { }
-
-#endif