Modify ctype.h headers to test for non-GNU inline semantics correctly
GCC and Clang will not define __GNUC_STDC_INLINE__ when compiling C++, so this
macro currently implies regular C++ inline semantics in C++. This may cause
the compiler to emit an external definition of the function, which will cause
link errors when compiling with -fvisibility=hidden; see e.g. crbug.com/481902.
To fix this, also test the __cplusplus macro when deciding whether to assume
non-GNU inline semantics.
Change-Id: Ia31cfb8f01465b6f5354ec619223d7cc78b064e1
diff --git a/4/platforms/android-3/arch-arm/usr/include/ctype.h b/4/platforms/android-3/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/4/platforms/android-3/arch-arm/usr/include/ctype.h
+++ b/4/platforms/android-3/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/4/platforms/android-4/arch-arm/usr/include/ctype.h b/4/platforms/android-4/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/4/platforms/android-4/arch-arm/usr/include/ctype.h
+++ b/4/platforms/android-4/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/4/platforms/android-5/arch-arm/usr/include/ctype.h b/4/platforms/android-5/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/4/platforms/android-5/arch-arm/usr/include/ctype.h
+++ b/4/platforms/android-5/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/4/platforms/android-8/arch-arm/usr/include/ctype.h b/4/platforms/android-8/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/4/platforms/android-8/arch-arm/usr/include/ctype.h
+++ b/4/platforms/android-8/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/4/platforms/android-8/arch-x86/usr/include/ctype.h b/4/platforms/android-8/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/4/platforms/android-8/arch-x86/usr/include/ctype.h
+++ b/4/platforms/android-8/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/5/platforms/android-3/arch-arm/usr/include/ctype.h b/5/platforms/android-3/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/5/platforms/android-3/arch-arm/usr/include/ctype.h
+++ b/5/platforms/android-3/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/6/platforms/android-3/arch-arm/usr/include/ctype.h b/6/platforms/android-3/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/6/platforms/android-3/arch-arm/usr/include/ctype.h
+++ b/6/platforms/android-3/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/6/platforms/android-3/arch-x86/usr/include/ctype.h b/6/platforms/android-3/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/6/platforms/android-3/arch-x86/usr/include/ctype.h
+++ b/6/platforms/android-3/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/7/platforms/android-14/arch-arm/usr/include/ctype.h b/7/platforms/android-14/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/7/platforms/android-14/arch-arm/usr/include/ctype.h
+++ b/7/platforms/android-14/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/7/platforms/android-14/arch-x86/usr/include/ctype.h b/7/platforms/android-14/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/7/platforms/android-14/arch-x86/usr/include/ctype.h
+++ b/7/platforms/android-14/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/7/platforms/android-3/arch-arm/usr/include/ctype.h b/7/platforms/android-3/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/7/platforms/android-3/arch-arm/usr/include/ctype.h
+++ b/7/platforms/android-3/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/7/platforms/android-3/arch-x86/usr/include/ctype.h b/7/platforms/android-3/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/7/platforms/android-3/arch-x86/usr/include/ctype.h
+++ b/7/platforms/android-3/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/7/platforms/android-4/arch-arm/usr/include/ctype.h b/7/platforms/android-4/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/7/platforms/android-4/arch-arm/usr/include/ctype.h
+++ b/7/platforms/android-4/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/7/platforms/android-4/arch-x86/usr/include/ctype.h b/7/platforms/android-4/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/7/platforms/android-4/arch-x86/usr/include/ctype.h
+++ b/7/platforms/android-4/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/7/platforms/android-5/arch-arm/usr/include/ctype.h b/7/platforms/android-5/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/7/platforms/android-5/arch-arm/usr/include/ctype.h
+++ b/7/platforms/android-5/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/7/platforms/android-5/arch-x86/usr/include/ctype.h b/7/platforms/android-5/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/7/platforms/android-5/arch-x86/usr/include/ctype.h
+++ b/7/platforms/android-5/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/7/platforms/android-8/arch-arm/usr/include/ctype.h b/7/platforms/android-8/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/7/platforms/android-8/arch-arm/usr/include/ctype.h
+++ b/7/platforms/android-8/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/7/platforms/android-8/arch-x86/usr/include/ctype.h b/7/platforms/android-8/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/7/platforms/android-8/arch-x86/usr/include/ctype.h
+++ b/7/platforms/android-8/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/7/platforms/android-9/arch-arm/usr/include/ctype.h b/7/platforms/android-9/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/7/platforms/android-9/arch-arm/usr/include/ctype.h
+++ b/7/platforms/android-9/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/7/platforms/android-9/arch-x86/usr/include/ctype.h b/7/platforms/android-9/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/7/platforms/android-9/arch-x86/usr/include/ctype.h
+++ b/7/platforms/android-9/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/8/platforms/android-14/arch-arm/usr/include/ctype.h b/8/platforms/android-14/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/8/platforms/android-14/arch-arm/usr/include/ctype.h
+++ b/8/platforms/android-14/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/8/platforms/android-14/arch-mips/usr/include/ctype.h b/8/platforms/android-14/arch-mips/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/8/platforms/android-14/arch-mips/usr/include/ctype.h
+++ b/8/platforms/android-14/arch-mips/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/8/platforms/android-14/arch-x86/usr/include/ctype.h b/8/platforms/android-14/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/8/platforms/android-14/arch-x86/usr/include/ctype.h
+++ b/8/platforms/android-14/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/8/platforms/android-3/arch-arm/usr/include/ctype.h b/8/platforms/android-3/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/8/platforms/android-3/arch-arm/usr/include/ctype.h
+++ b/8/platforms/android-3/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/8/platforms/android-4/arch-arm/usr/include/ctype.h b/8/platforms/android-4/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/8/platforms/android-4/arch-arm/usr/include/ctype.h
+++ b/8/platforms/android-4/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/8/platforms/android-5/arch-arm/usr/include/ctype.h b/8/platforms/android-5/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/8/platforms/android-5/arch-arm/usr/include/ctype.h
+++ b/8/platforms/android-5/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/8/platforms/android-8/arch-arm/usr/include/ctype.h b/8/platforms/android-8/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/8/platforms/android-8/arch-arm/usr/include/ctype.h
+++ b/8/platforms/android-8/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/8/platforms/android-9/arch-arm/usr/include/ctype.h b/8/platforms/android-9/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/8/platforms/android-9/arch-arm/usr/include/ctype.h
+++ b/8/platforms/android-9/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/8/platforms/android-9/arch-mips/usr/include/ctype.h b/8/platforms/android-9/arch-mips/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/8/platforms/android-9/arch-mips/usr/include/ctype.h
+++ b/8/platforms/android-9/arch-mips/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/8/platforms/android-9/arch-x86/usr/include/ctype.h b/8/platforms/android-9/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/8/platforms/android-9/arch-x86/usr/include/ctype.h
+++ b/8/platforms/android-9/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-12/arch-arm/usr/include/ctype.h b/9/platforms/android-12/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-12/arch-arm/usr/include/ctype.h
+++ b/9/platforms/android-12/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-12/arch-mips/usr/include/ctype.h b/9/platforms/android-12/arch-mips/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-12/arch-mips/usr/include/ctype.h
+++ b/9/platforms/android-12/arch-mips/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-12/arch-x86/usr/include/ctype.h b/9/platforms/android-12/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-12/arch-x86/usr/include/ctype.h
+++ b/9/platforms/android-12/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-13/arch-arm/usr/include/ctype.h b/9/platforms/android-13/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-13/arch-arm/usr/include/ctype.h
+++ b/9/platforms/android-13/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-13/arch-mips/usr/include/ctype.h b/9/platforms/android-13/arch-mips/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-13/arch-mips/usr/include/ctype.h
+++ b/9/platforms/android-13/arch-mips/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-13/arch-x86/usr/include/ctype.h b/9/platforms/android-13/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-13/arch-x86/usr/include/ctype.h
+++ b/9/platforms/android-13/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-14/arch-arm/usr/include/ctype.h b/9/platforms/android-14/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-14/arch-arm/usr/include/ctype.h
+++ b/9/platforms/android-14/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-14/arch-mips/usr/include/ctype.h b/9/platforms/android-14/arch-mips/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-14/arch-mips/usr/include/ctype.h
+++ b/9/platforms/android-14/arch-mips/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-14/arch-x86/usr/include/ctype.h b/9/platforms/android-14/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-14/arch-x86/usr/include/ctype.h
+++ b/9/platforms/android-14/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-15/arch-arm/usr/include/ctype.h b/9/platforms/android-15/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-15/arch-arm/usr/include/ctype.h
+++ b/9/platforms/android-15/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-15/arch-mips/usr/include/ctype.h b/9/platforms/android-15/arch-mips/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-15/arch-mips/usr/include/ctype.h
+++ b/9/platforms/android-15/arch-mips/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-15/arch-x86/usr/include/ctype.h b/9/platforms/android-15/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-15/arch-x86/usr/include/ctype.h
+++ b/9/platforms/android-15/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-16/arch-arm/usr/include/ctype.h b/9/platforms/android-16/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-16/arch-arm/usr/include/ctype.h
+++ b/9/platforms/android-16/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-16/arch-mips/usr/include/ctype.h b/9/platforms/android-16/arch-mips/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-16/arch-mips/usr/include/ctype.h
+++ b/9/platforms/android-16/arch-mips/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-16/arch-x86/usr/include/ctype.h b/9/platforms/android-16/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-16/arch-x86/usr/include/ctype.h
+++ b/9/platforms/android-16/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-17/arch-arm/usr/include/ctype.h b/9/platforms/android-17/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-17/arch-arm/usr/include/ctype.h
+++ b/9/platforms/android-17/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-17/arch-mips/usr/include/ctype.h b/9/platforms/android-17/arch-mips/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-17/arch-mips/usr/include/ctype.h
+++ b/9/platforms/android-17/arch-mips/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-17/arch-x86/usr/include/ctype.h b/9/platforms/android-17/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-17/arch-x86/usr/include/ctype.h
+++ b/9/platforms/android-17/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-18/arch-arm/usr/include/ctype.h b/9/platforms/android-18/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-18/arch-arm/usr/include/ctype.h
+++ b/9/platforms/android-18/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-18/arch-mips/usr/include/ctype.h b/9/platforms/android-18/arch-mips/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-18/arch-mips/usr/include/ctype.h
+++ b/9/platforms/android-18/arch-mips/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-18/arch-x86/usr/include/ctype.h b/9/platforms/android-18/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-18/arch-x86/usr/include/ctype.h
+++ b/9/platforms/android-18/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-19/arch-arm/usr/include/ctype.h b/9/platforms/android-19/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-19/arch-arm/usr/include/ctype.h
+++ b/9/platforms/android-19/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-19/arch-mips/usr/include/ctype.h b/9/platforms/android-19/arch-mips/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-19/arch-mips/usr/include/ctype.h
+++ b/9/platforms/android-19/arch-mips/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-19/arch-x86/usr/include/ctype.h b/9/platforms/android-19/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-19/arch-x86/usr/include/ctype.h
+++ b/9/platforms/android-19/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-3/arch-arm/usr/include/ctype.h b/9/platforms/android-3/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-3/arch-arm/usr/include/ctype.h
+++ b/9/platforms/android-3/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-4/arch-arm/usr/include/ctype.h b/9/platforms/android-4/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-4/arch-arm/usr/include/ctype.h
+++ b/9/platforms/android-4/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-5/arch-arm/usr/include/ctype.h b/9/platforms/android-5/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-5/arch-arm/usr/include/ctype.h
+++ b/9/platforms/android-5/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-8/arch-arm/usr/include/ctype.h b/9/platforms/android-8/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-8/arch-arm/usr/include/ctype.h
+++ b/9/platforms/android-8/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-9/arch-arm/usr/include/ctype.h b/9/platforms/android-9/arch-arm/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-9/arch-arm/usr/include/ctype.h
+++ b/9/platforms/android-9/arch-arm/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-9/arch-mips/usr/include/ctype.h b/9/platforms/android-9/arch-mips/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-9/arch-mips/usr/include/ctype.h
+++ b/9/platforms/android-9/arch-mips/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
diff --git a/9/platforms/android-9/arch-x86/usr/include/ctype.h b/9/platforms/android-9/arch-x86/usr/include/ctype.h
index 58b76ea..5fbf213 100644
--- a/9/platforms/android-9/arch-x86/usr/include/ctype.h
+++ b/9/platforms/android-9/arch-x86/usr/include/ctype.h
@@ -59,7 +59,7 @@
/* extern __inline is a GNU C extension */
#ifdef __GNUC__
-# if defined(__GNUC_STDC_INLINE__)
+# if defined(__GNUC_STDC_INLINE__) || defined(__cplusplus)
#define __CTYPE_INLINE extern __inline __attribute__((__gnu_inline__))
# else
#define __CTYPE_INLINE extern __inline
