OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0028971: Configuration - fix compatibility with glibc 2.26+ due to xlocale.h removal

Browse Source
This commit is contained in:
kgv 2017-08-07 17:09:11 +03:00 committed by bugmaster
parent b101eb1ff0
commit e2c4ce4869
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Standard/Standard_CLocaleSentry.cxx
View File

@ -32,7 +32,7 @@ namespace
CLocalePtr() CLocalePtr()
#ifdef HAVE_XLOCALE_H #ifdef HAVE_XLOCALE_H
: myLocale (newlocale (LC_ALL_MASK, "C", NULL)) : myLocale (newlocale (LC_ALL_MASK, "C", NULL))
#elif defined(_WIN32) && !defined(__MINGW32__) #elif defined(_MSC_VER)
: myLocale (_create_locale (LC_ALL, "C")) : myLocale (_create_locale (LC_ALL, "C"))
#else #else
: myLocale (NULL) : myLocale (NULL)
@ -43,7 +43,7 @@ namespace
{ {
#ifdef HAVE_XLOCALE_H #ifdef HAVE_XLOCALE_H
freelocale (myLocale); freelocale (myLocale);
#elif defined(_WIN32) && !defined(__MINGW32__) #elif defined(_MSC_VER)
_free_locale (myLocale); _free_locale (myLocale);
#endif #endif
} }

7
src/Standard/Standard_CLocaleSentry.hxx
View File

@ -35,7 +35,8 @@
#endif #endif
#endif // ifndef HAVE_LOCALE_H #endif // ifndef HAVE_LOCALE_H
#ifdef HAVE_XLOCALE_H #if defined(HAVE_XLOCALE_H) && !(defined(__GLIBC__) && (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 24))
// xlocale.h is actually a non-standard header file; glibc 2.26 has removed it altogether (all definition comes from locale.h)
#include <xlocale.h> #include <xlocale.h>
#endif #endif
@ -65,7 +66,7 @@ public:
#ifdef HAVE_XLOCALE_H #ifdef HAVE_XLOCALE_H
typedef locale_t clocale_t; typedef locale_t clocale_t;
#elif defined(_WIN32) && !defined(__MINGW32__) #elif defined(_MSC_VER)
typedef _locale_t clocale_t; typedef _locale_t clocale_t;
#else #else
typedef void* clocale_t; typedef void* clocale_t;
@ -78,7 +79,7 @@ public:
private: private:
void* myPrevLocale; //!< previous locale, platform-dependent pointer! void* myPrevLocale; //!< previous locale, platform-dependent pointer!
#ifdef _WIN32 #ifdef _MSC_VER
int myPrevTLocaleState; //!< previous thread-locale state, MSVCRT-specific int myPrevTLocaleState; //!< previous thread-locale state, MSVCRT-specific
#endif #endif

2
src/Standard/Standard_CString.cxx
View File

@ -63,7 +63,7 @@ Standard_Integer HashCodes (const Standard_CString Value,
#ifdef __APPLE__ #ifdef __APPLE__
// There are a lot of *_l functions availalbe on Mac OS X - we use them // There are a lot of *_l functions availalbe on Mac OS X - we use them
#define SAVE_TL() #define SAVE_TL()
#elif defined(_WIN32) && !defined(__MINGW32__) #elif defined(_MSC_VER)
// MSVCRT has equivalents with slightly different syntax // MSVCRT has equivalents with slightly different syntax
#define SAVE_TL() #define SAVE_TL()
#define strtod_l(thePtr, theNextPtr, theLocale) _strtod_l(thePtr, theNextPtr, theLocale) #define strtod_l(thePtr, theNextPtr, theLocale) _strtod_l(thePtr, theNextPtr, theLocale)