0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233
  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. This is defined by musl if wchar_t is already defined
  6. avoids errors like
  7. src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h:46:15: error: typedef redefinition with different types
  8. ('int' vs 'unsigned int')
  9. typedef int wchar_t;
  10. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  11. ---
  12. Upstream-Status: Pending
  13. src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h | 2 +-
  14. 1 file changed, 1 insertion(+), 1 deletion(-)
  15. Index: git/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h
  16. ===================================================================
  17. --- git.orig/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h
  18. +++ git/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h
  19. @@ -43,7 +43,7 @@
  20. #if 0 // MongoDB Modification -- just `#include <stddef.h>`
  21. // Fix system header issue on Sun solaris and define required type by ourselves
  22. -#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__)
  23. +#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) && !defined(__DEFINED_wchar_t)
  24. typedef int wchar_t;
  25. #endif
  26. #else