diff --git a/README.chromium b/README.chromium
index 483ffd3fd..9d9d87063 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 97
+Version: 98
 License: BSD
 License File: LICENSE
 
diff --git a/source/rotate.cc b/source/rotate.cc
index 42abc22a1..eda8ecbd4 100644
--- a/source/rotate.cc
+++ b/source/rotate.cc
@@ -365,9 +365,9 @@ extern "C" void TransposeUVWx8_SSE2(const uint8* src, int src_stride,
                                     uint8* dst_a, int dst_stride_a,
                                     uint8* dst_b, int dst_stride_b,
                                     int w);
-  asm volatile (
+  asm (
     ".text                                     \n"
-#if defined(OSX)
+#if defined(__APPLE__)
     ".globl _TransposeUVWx8_SSE2               \n"
 "_TransposeUVWx8_SSE2:                         \n"
 #else
diff --git a/source/scale.cc b/source/scale.cc
index 39de59da8..8006e0dc7 100644
--- a/source/scale.cc
+++ b/source/scale.cc
@@ -511,7 +511,7 @@ static void ScaleRowDown38_2_Int_NEON(const uint8* src_ptr, int src_stride,
     !defined(YUV_DISABLE_ASM)
 #if defined(_MSC_VER)
 #define TALIGN16(t, var) __declspec(align(16)) t _ ## var
-#elif defined(OSX) && defined(__i386__)
+#elif defined(__APPLE__) && defined(__i386__)
 #define TALIGN16(t, var) t var __attribute__((aligned(16)))
 #else
 #define TALIGN16(t, var) t _ ## var __attribute__((aligned(16)))
@@ -1621,7 +1621,7 @@ extern "C" void ScaleRowDown8Int_SSE2(const uint8* src_ptr, int src_stride,
                                       uint8* dst_ptr, int dst_width);
   asm(
     ".text                                     \n"
-#if defined(OSX)
+#if defined(__APPLE__)
     ".globl _ScaleRowDown8Int_SSE2             \n"
 "_ScaleRowDown8Int_SSE2:                       \n"
 #else
@@ -1692,7 +1692,7 @@ extern "C" void ScaleRowDown34_SSSE3(const uint8* src_ptr, int src_stride,
                                      uint8* dst_ptr, int dst_width);
   asm(
     ".text                                     \n"
-#if defined(OSX)
+#if defined(__APPLE__)
     ".globl _ScaleRowDown34_SSSE3              \n"
 "_ScaleRowDown34_SSSE3:                        \n"
 #else
@@ -1730,7 +1730,7 @@ extern "C" void ScaleRowDown34_1_Int_SSSE3(const uint8* src_ptr, int src_stride,
                                            uint8* dst_ptr, int dst_width);
   asm(
     ".text                                     \n"
-#if defined(OSX)
+#if defined(__APPLE__)
     ".globl _ScaleRowDown34_1_Int_SSSE3        \n"
 "_ScaleRowDown34_1_Int_SSSE3:                  \n"
 #else
@@ -1791,7 +1791,7 @@ extern "C" void ScaleRowDown34_0_Int_SSSE3(const uint8* src_ptr, int src_stride,
                                            uint8* dst_ptr, int dst_width);
   asm(
     ".text                                     \n"
-#if defined(OSX)
+#if defined(__APPLE__)
     ".globl _ScaleRowDown34_0_Int_SSSE3        \n"
 "_ScaleRowDown34_0_Int_SSSE3:                  \n"
 #else
@@ -1855,7 +1855,7 @@ extern "C" void ScaleRowDown38_SSSE3(const uint8* src_ptr, int src_stride,
                                      uint8* dst_ptr, int dst_width);
   asm(
     ".text                                     \n"
-#if defined(OSX)
+#if defined(__APPLE__)
     ".globl _ScaleRowDown38_SSSE3              \n"
 "_ScaleRowDown38_SSSE3:                        \n"
 #else
@@ -1891,7 +1891,7 @@ extern "C" void ScaleRowDown38_3_Int_SSSE3(const uint8* src_ptr, int src_stride,
                                            uint8* dst_ptr, int dst_width);
   asm(
     ".text                                     \n"
-#if defined(OSX)
+#if defined(__APPLE__)
     ".globl _ScaleRowDown38_3_Int_SSSE3        \n"
 "_ScaleRowDown38_3_Int_SSSE3:                  \n"
 #else
@@ -1955,7 +1955,7 @@ extern "C" void ScaleRowDown38_2_Int_SSSE3(const uint8* src_ptr, int src_stride,
                                            uint8* dst_ptr, int dst_width);
   asm(
     ".text                                     \n"
-#if defined(OSX)
+#if defined(__APPLE__)
     ".globl _ScaleRowDown38_2_Int_SSSE3        \n"
 "_ScaleRowDown38_2_Int_SSSE3:                  \n"
 #else
@@ -2002,7 +2002,7 @@ extern "C" void ScaleAddRows_SSE2(const uint8* src_ptr, int src_stride,
                                   int src_height);
   asm(
     ".text                                     \n"
-#if defined(OSX)
+#if defined(__APPLE__)
     ".globl _ScaleAddRows_SSE2                 \n"
 "_ScaleAddRows_SSE2:                           \n"
 #else
@@ -2053,7 +2053,7 @@ extern "C" void ScaleFilterRows_SSE2(uint8* dst_ptr,
                                      int dst_width, int source_y_fraction);
   asm(
     ".text                                     \n"
-#if defined(OSX)
+#if defined(__APPLE__)
     ".globl _ScaleFilterRows_SSE2              \n"
 "_ScaleFilterRows_SSE2:                        \n"
 #else
@@ -2148,7 +2148,7 @@ extern "C" void ScaleFilterRows_SSSE3(uint8* dst_ptr,
                                       int dst_width, int source_y_fraction);
   asm(
     ".text                                     \n"
-#if defined(OSX)
+#if defined(__APPLE__)
     ".globl _ScaleFilterRows_SSSE3             \n"
 "_ScaleFilterRows_SSSE3:                       \n"
 #else