From f18be83d42369c3d63dac585ee01fa031c57a3f7 Mon Sep 17 00:00:00 2001 From: meh Date: Tue, 16 Jun 2015 23:48:26 +0200 Subject: [PATCH] avutil/mem: disable inline function that doesn't work on Windows --- sys/src/avutil/mem.rs | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/sys/src/avutil/mem.rs b/sys/src/avutil/mem.rs index 36b6dfa..b69bd13 100644 --- a/sys/src/avutil/mem.rs +++ b/sys/src/avutil/mem.rs @@ -1,4 +1,4 @@ -use libc::{c_void, c_char, c_int, c_uint, uint8_t, size_t, EINVAL}; +use libc::{c_void, c_char, c_int, c_uint, uint8_t, size_t}; use std::mem; use std::ptr; use super::error::AVERROR; @@ -23,19 +23,21 @@ pub unsafe fn av_mallocz_array(nmemb: size_t, size: size_t) -> *mut c_void { } } -#[inline(always)] -pub unsafe fn av_size_mult(a: size_t, b: size_t, r: *mut size_t) -> c_int { - let t = a * b; - - if (a | b) >= (1 << (mem::size_of::() * 4)) && a != 0 && t / a != b { - AVERROR(EINVAL) - } - else { - *r = t; - - 0 - } -} +//#[inline(always)] +//pub unsafe fn av_size_mult(a: size_t, b: size_t, r: *mut size_t) -> c_int { +// use libc::EINVAL; +// +// let t = a * b; +// +// if (a | b) >= (1 << (mem::size_of::() * 4)) && a != 0 && t / a != b { +// AVERROR(EINVAL) +// } +// else { +// *r = t; +// +// 0 +// } +//} #[link(name = "avutil")] extern {