blob: 4d7ac3aa56633ca47f7d83e6ae171e532483d11e [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -05001From fbfceebce2121831904f2f7115252dd03b413a6d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 19 Sep 2017 18:52:53 -0700
4Subject: [PATCH] IntelRDFPMathLib20U1: Check for __DEFINED_wchar_t
5
6This is defined by musl if wchar_t is already defined
7
8avoids errors like
9
10src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h:46:15: error: typedef redefinition with different types
11 ('int' vs 'unsigned int')
12typedef int wchar_t;
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16Upstream-Status: Pending
17
18 src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080021Index: git/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h
22===================================================================
23--- git.orig/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h
24+++ git/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h
25@@ -43,7 +43,7 @@
Brad Bishopd7bf8c12018-02-25 22:55:05 -050026
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080027 #if 0 // MongoDB Modification -- just `#include <stddef.h>`
Brad Bishopd7bf8c12018-02-25 22:55:05 -050028 // Fix system header issue on Sun solaris and define required type by ourselves
29-#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__)
30+#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) && !defined(__DEFINED_wchar_t)
31 typedef int wchar_t;
32 #endif
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080033 #else