diff --git a/README.chromium b/README.chromium
index fdc5836c3..92fa6c127 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 118
+Version: 119
 License: BSD
 License File: LICENSE
 
diff --git a/source/rotate.cc b/source/rotate.cc
index 0d66d9562..d2617ab2a 100644
--- a/source/rotate.cc
+++ b/source/rotate.cc
@@ -28,14 +28,17 @@ uvec8 kShuffleReverseUV = {
   14u, 12u, 10u, 8u, 6u, 4u, 2u, 0u, 15u, 13u, 11u, 9u, 7u, 5u, 3u, 1u
 };
 
-#if (defined(__APPLE__) || defined(__MINGW32__) || defined(__CYGWIN__)) && \
-    defined(__i386__)
+#if defined(__APPLE__) && defined(__i386__)
 #define DECLARE_FUNCTION(name)                                                 \
     ".text                                     \n"                             \
-    ".globl _" #name "                         \n"                             \
     ".private_extern _" #name "                \n"                             \
     ".align 4,0x90                             \n"                             \
 "_" #name ":                                   \n"
+#elif (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(__i386__)
+#define DECLARE_FUNCTION(name)                                                 \
+    ".text                                     \n"                             \
+    ".align 4,0x90                             \n"                             \
+"_" #name ":                                   \n"
 #else
 #define DECLARE_FUNCTION(name)                                                 \
     ".text                                     \n"                             \
diff --git a/source/scale.cc b/source/scale.cc
index 9cf7d6db7..7db189984 100644
--- a/source/scale.cc
+++ b/source/scale.cc
@@ -521,14 +521,17 @@ static void ScaleRowDown38_2_Int_NEON(const uint8* src_ptr, int src_stride,
 #define TALIGN16(t, var) t _ ## var __attribute__((aligned(16)))
 #endif
 
-#if (defined(__APPLE__) || defined(__MINGW32__) || defined(__CYGWIN__)) && \
-    defined(__i386__)
+#if defined(__APPLE__) && defined(__i386__)
 #define DECLARE_FUNCTION(name)                                                 \
     ".text                                     \n"                             \
-    ".globl _" #name "                         \n"                             \
     ".private_extern _" #name "                \n"                             \
     ".align 4,0x90                             \n"                             \
 "_" #name ":                                   \n"
+#elif (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(__i386__)
+#define DECLARE_FUNCTION(name)                                                 \
+    ".text                                     \n"                             \
+    ".align 4,0x90                             \n"                             \
+"_" #name ":                                   \n"
 #else
 #define DECLARE_FUNCTION(name)                                                 \
     ".text                                     \n"                             \