Bug 1453061 - Merge libvpx code size fix. r=drno, a=RyanVM
authorDavid Major <dmajor@mozilla.com>
Thu, 10 May 2018 14:31:49 -0400
changeset 449886 27b5a1a03f38600c8a24b5fcdd20bbc94c885dd7
parent 449885 5f480411f54538cccc002fc8c6cbcaca0eabfc06
child 449887 390c533b2694d00af7d3170174eaef727d298482
push id110
push userryanvm@gmail.com
push dateFri, 13 Jul 2018 21:23:07 +0000
treeherdermozilla-esr60@e290aa06c191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdrno, RyanVM
bugs1453061, 841103
milestone60.1.1
Bug 1453061 - Merge libvpx code size fix. r=drno, a=RyanVM https://chromium-review.googlesource.com/c/webm/libvpx/+/841103
media/libvpx/config/win/x64/vpx_config.h
media/libvpx/libvpx/configure
--- a/media/libvpx/config/win/x64/vpx_config.h
+++ b/media/libvpx/config/win/x64/vpx_config.h
@@ -4,17 +4,17 @@
 /* that can be found in the LICENSE file in the root of the source */
 /* tree. An additional intellectual property rights grant can be found */
 /* in the file PATENTS.  All contributing project authors may */
 /* be found in the AUTHORS file in the root of the source tree. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
 #define RESTRICT    
-#define INLINE      __forceinline
+#define INLINE      __inline
 #define ARCH_ARM 0
 #define ARCH_MIPS 0
 #define ARCH_X86 0
 #define ARCH_X86_64 1
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0
 #define HAVE_DSPR2 0
--- a/media/libvpx/libvpx/configure
+++ b/media/libvpx/libvpx/configure
@@ -639,17 +639,17 @@ process_toolchain() {
     case "$tgt_cc" in
         vs*) enable_feature msvs
              enable_feature solution
              vs_version=${tgt_cc##vs}
              VCPROJ_SFX=vcxproj
              gen_vcproj_cmd=${source_path}/build/make/gen_msvs_vcxproj.sh
              enabled werror && gen_vcproj_cmd="${gen_vcproj_cmd} --enable-werror"
              all_targets="${all_targets} solution"
-             INLINE="__forceinline"
+             INLINE="__inline"
         ;;
     esac
 
     # Other toolchain specific defaults
     case $toolchain in x86*) soft_enable postproc;; esac
 
     if enabled postproc_visualizer; then
         enabled postproc || die "postproc_visualizer requires postproc to be enabled"