Brad Bishop | 0a92126 | 2019-09-24 07:40:45 -0400 | [diff] [blame] | 1 | From 97914aeab52b4d0ea0ab9e5ff985a1c5cddb0fa1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Vincent Prince <vincent.prince.fr@gmail.com> |
| 3 | Date: Mon, 16 Sep 2019 13:41:39 +0200 |
| 4 | Subject: [PATCH 06/10] IntelRDFPMathLib20U1: Check for __DEFINED_wchar_t |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5 | |
| 6 | This is defined by musl if wchar_t is already defined |
| 7 | |
| 8 | avoids errors like |
| 9 | |
| 10 | src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h:46:15: error: typedef redefinition with different types |
| 11 | ('int' vs 'unsigned int') |
| 12 | typedef int wchar_t; |
| 13 | |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Brad Bishop | 0a92126 | 2019-09-24 07:40:45 -0400 | [diff] [blame] | 15 | Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com> |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 16 | --- |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 17 | src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h | 2 +- |
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 19 | |
Brad Bishop | 0a92126 | 2019-09-24 07:40:45 -0400 | [diff] [blame] | 20 | diff --git a/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h b/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h |
| 21 | index 56775bc..be96a85 100755 |
| 22 | --- a/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h |
| 23 | +++ b/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 24 | @@ -43,7 +43,7 @@ |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 25 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 26 | #if 0 // MongoDB Modification -- just `#include <stddef.h>` |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 27 | // Fix system header issue on Sun solaris and define required type by ourselves |
| 28 | -#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) |
| 29 | +#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) && !defined(__DEFINED_wchar_t) |
| 30 | typedef int wchar_t; |
| 31 | #endif |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 32 | #else |
Brad Bishop | 0a92126 | 2019-09-24 07:40:45 -0400 | [diff] [blame] | 33 | -- |
| 34 | 2.7.4 |
| 35 | |