diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2014-10-18 14:38:06 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2014-10-18 14:38:06 +0000 |
| commit | c6615e8df99b25666429ca8707b21cb2907fe9ea (patch) | |
| tree | ef84b1c0ef7963bf89cd91b6c3f0d4cb7a0ce00a | |
| parent | - Drop @dirrm* from plist (diff) | |
Fix build on FreeBSD-8.4.
Notes
Notes:
svn path=/head/; revision=371128
| -rw-r--r-- | cad/opencascade/files/patch-inc_Standard_CLocaleSentry.hxx | 2 | ||||
| -rw-r--r-- | cad/opencascade/files/patch-src_Standard_Standard_CString.cxx | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/cad/opencascade/files/patch-inc_Standard_CLocaleSentry.hxx b/cad/opencascade/files/patch-inc_Standard_CLocaleSentry.hxx index a2ec473bd88e..02956ae04166 100644 --- a/cad/opencascade/files/patch-inc_Standard_CLocaleSentry.hxx +++ b/cad/opencascade/files/patch-inc_Standard_CLocaleSentry.hxx @@ -5,7 +5,7 @@ //! since POSIX didn't declared such identifier. //! We check _GNU_SOURCE for glibc extensions here and it is always defined by g++ compiler. -#if defined(__APPLE__) || defined(_GNU_SOURCE) || defined(HAVE_XLOCALE_H) -+#if defined(__APPLE__) || defined(_GNU_SOURCE) || (defined(__FreeBSD__) && (__FreeBSD_version < 910000)) || defined(HAVE_XLOCALE_H) ++#if defined(__APPLE__) || defined(_GNU_SOURCE) || (defined(__FreeBSD__) && (__FreeBSD_version > 910000)) || defined(HAVE_XLOCALE_H) #include <xlocale.h> #ifndef HAVE_XLOCALE_H #define HAVE_XLOCALE_H diff --git a/cad/opencascade/files/patch-src_Standard_Standard_CString.cxx b/cad/opencascade/files/patch-src_Standard_Standard_CString.cxx new file mode 100644 index 000000000000..09ec78e11cde --- /dev/null +++ b/cad/opencascade/files/patch-src_Standard_Standard_CString.cxx @@ -0,0 +1,11 @@ +--- src/Standard/Standard_CString.cxx.orig 2014-04-29 11:40:41.000000000 +0200 ++++ src/Standard/Standard_CString.cxx 2014-10-18 16:05:36.000000000 +0200 +@@ -94,7 +94,7 @@ + // So we switch to C locale temporarily + #define SAVE_TL() Standard_CLocaleSentry aLocaleSentry; + #ifndef HAVE_XLOCALE_H +- #error System does not support xlocale. Import/export could be broken if C locale did not specified by application. ++ // #error System does not support xlocale. Import/export could be broken if C locale did not specified by application. + #define strtod_l(thePtr, theNextPtr, theLocale) strtod(thePtr, theNextPtr) + #endif + #define vprintf_l(theLocale, theFormat, theArgPtr) vprintf(theFormat, theArgPtr) |