From: kgv Date: Sun, 27 Sep 2020 16:51:56 +0000 (+0300) Subject: 0031799: Configuration - compilation errors with Android NDK r12 X-Git-Tag: V7_5_0_beta~26 X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=42624fdc754b12d1e904545343fc2f57fe96149c;p=occt.git 0031799: Configuration - compilation errors with Android NDK r12 Added missing include (va_list) to Standard_CString.hxx. Do not include in delabella.cpp when using gcc 4.9 from Android NDK. --- diff --git a/src/BRepMesh/delabella.cpp b/src/BRepMesh/delabella.cpp index e88ccf297f..c6e5260a19 100644 --- a/src/BRepMesh/delabella.cpp +++ b/src/BRepMesh/delabella.cpp @@ -27,7 +27,11 @@ SOFTWARE. #include #include -#include + +// gcc 4.9 for Android doesn't have search.h +#if !defined(__ANDROID__) || defined(__clang__) + #include +#endif #if (defined(__APPLE__)) #include diff --git a/src/Standard/Standard_CString.hxx b/src/Standard/Standard_CString.hxx index 451fc2f534..3513016ad8 100644 --- a/src/Standard/Standard_CString.hxx +++ b/src/Standard/Standard_CString.hxx @@ -16,12 +16,13 @@ //! Functions working with plain C strings #ifndef _Standard_CString_HeaderFile -# define _Standard_CString_HeaderFile +#define _Standard_CString_HeaderFile #include -# include -# include +#include +#include +#include # if defined(_MSC_VER) && ! defined(strcasecmp) # define strcasecmp _stricmp