[patch] STLport-5.1.5-cxx_use_c99.patch

STLport-5.1.5-cxx_use_c99.patch (text/plain), 1.35 KB, created by Peter Alfredsen (RETIRED) on 2008-04-27 13:36:14 UTC

--- STLport-5.1.5.orig/stlport/stl/_cstdlib.h
+++ STLport-5.1.5/stlport/stl/_cstdlib.h
@@ -16,12 +16,27 @@
 #ifndef _STLP_INTERNAL_CSTDLIB
 #define _STLP_INTERNAL_CSTDLIB
 
+/* Work around inconsistent definition of _GLIBCXX_USE_C99 across arches; on
+ * these arches std::llabs is therefore not available.
+ *
+ * See http://bugs.debian.org/443234
+ */
+#ifndef _GLIBCXX_USE_C99
+#define _GLIBCXX_USE_C99 1
+#define _HACK_CXX_USE_C99 1
+#endif
+
 #if defined (_STLP_USE_NEW_C_HEADERS)
 #  include _STLP_NATIVE_CPP_C_HEADER(cstdlib)
 #else
 #  include <stdlib.h>
 #endif
 
+#ifdef _HACK_CXX_USE_C99
+#undef _GLIBCXX_USE_C99
+#undef _HACK_CXX_USE_C99
+#endif
+
 #if defined (__BORLANDC__)
 /* Borland process.h header do not bring anything here and is just included
  * in order to avoid inclusion later. This header cannot be included later
--- STLport-5.1.5.orig/stlport/stl/_cmath.h
+++ STLport-5.1.5/stlport/stl/_cmath.h
@@ -21,7 +21,16 @@
  * so cstdlib has to be included first.
  */
 #if defined (__GNUC__) && defined (_STLP_USE_NEW_C_HEADERS)
+/* See http://bugs.debian.org/443234 */
+#  ifndef _GLIBCXX_USE_C99
+#    define _GLIBCXX_USE_C99 1
+#    define _HACK_CXX_USE_C99 1
+#  endif
 #  include _STLP_NATIVE_CPP_C_HEADER(cstdlib)
+#  ifdef _HACK_CXX_USE_C99
+#    undef _GLIBCXX_USE_C99
+#    undef _HACK_CXX_USE_C99
+#  endif
 #endif
 
 #if defined (_STLP_USE_NEW_C_HEADERS)