commit 4ade5195f188b84ce3599c71ef058d040b141da4
author Tom Cherry <tomcherry@google.com> Sat Dec 05 00:21:46 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 05 00:21:46 2015 +0000
tree 117d9a8ada047bad24b3cf0e0aa55394f873d930
parent ef2ba3dbf986257ded12531fe15bf0d1d4a87d50
parent 21eadee6e97c08485c9ec52a8f44cabd4261bf4a

Merge "Do not create prop files for ctl.* properties"

libc/bionic/ndk_cruft.cpp

diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp
index 6609470..0af9d5b 100644
--- a/libc/bionic/ndk_cruft.cpp
+++ b/libc/bionic/ndk_cruft.cpp
@@ -287,11 +287,12 @@
 }
 
 // A leaked BSD stdio implementation detail that's now a no-op.
-extern "C" void __sinit() {
+// (GCC doesn't like 'extern "C"' on a definition.)
+extern "C" {
+void __sinit() {}
+int __sdidinit = 1;
 }
 
-extern "C" int __sdidinit = 1;
-
 // Only used by ftime, which was removed from POSIX 2008.
 struct timeb {
   time_t          time;