Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From fbfceebce2121831904f2f7115252dd03b413a6d Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 19 Sep 2017 18:52:53 -0700 |
| 4 | Subject: [PATCH] IntelRDFPMathLib20U1: Check for __DEFINED_wchar_t |
| 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> |
| 15 | --- |
| 16 | Upstream-Status: Pending |
| 17 | |
| 18 | src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h | 2 +- |
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 21 | Index: 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 Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 26 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 27 | #if 0 // MongoDB Modification -- just `#include <stddef.h>` |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 28 | // 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 33 | #else |