blob: e056be0fd3c91c565ca753c80f5bbacdaa132fba (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -125,6 +125,15 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [
## other macros from doing the same. This should be automated.) -pme
need_libmath=no
+ # Check for uClibc since Linux platforms use different configuration
+ # directories depending on the C library in use.
+ AC_EGREP_CPP([_using_uclibc], [
+ #include <stdio.h>
+ #if __UCLIBC__
+ _using_uclibc
+ #endif
+ ], uclibc=yes, uclibc=no)
+
# Find platform-specific directories containing configuration info.
# Also possibly modify flags used elsewhere, as needed by the platform.
GLIBCXX_CHECK_HOST
--- a/libstdc++-v3/config/os/gnu-linux/ctype_base.h
+++ b/libstdc++-v3/config/os/gnu-linux/ctype_base.h
@@ -31,8 +31,6 @@
//
// ISO C++ 14882: 22.1 Locales
//
-#include <features.h>
-#include <ctype.h>
/** @file ctype_base.h
* This is an internal header file, included by other library headers.
@@ -47,11 +45,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
struct ctype_base
{
// Non-standard typedefs.
-#ifdef __UCLIBC__
- typedef const __ctype_touplow_t* __to_type;
-#else
- typedef const int* __to_type;
-#endif
+ typedef const int* __to_type;
// NB: Offsets into ctype<char>::_M_table force a particular size
// on the mask type. Because of this, we don't use an enum.
|
