0001-FS-6010-resolve.patch 1.16 KB
Newer Older
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
From ce03adee8dee58a25c9bfa6e137390e9c13d6ca2 Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Fri, 29 Nov 2013 22:16:49 -0600
Subject: [PATCH] FS-6010 --resolve

---
 src/spandsp/fast_convert.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/spandsp/fast_convert.h b/src/spandsp/fast_convert.h
index 10679ea..af54e68 100644
--- a/src/spandsp/fast_convert.h
+++ b/src/spandsp/fast_convert.h
@@ -247,6 +247,7 @@ extern "C"
      *    Therefore implement inline versions of these functions here.
      */
 
+#if (_MSC_VER < 1800)
     __inline long int lrint(double x)
     {
         long int i;
@@ -287,6 +288,7 @@ extern "C"
             frndint
         }
     }
+#endif
 
     __inline long int lfastrint(double x)
     {
@@ -316,6 +318,7 @@ extern "C"
     /* x86_64 machines will do best with a simple assignment. */
 #include <intrin.h>
 
+#if (_MSC_VER < 1800)
     __inline long int lrint(double x)
     {
 		return (long int)_mm_cvtsd_si64x( _mm_loadu_pd ((const double*)&x) );
@@ -325,6 +328,7 @@ extern "C"
     {
 		return _mm_cvt_ss2si( _mm_load_ss((const float*)&x) );
     }
+#endif
 
     __inline long int lfastrint(double x)
     {
-- 
2.25.1