From 8766edc098304436a8b2b1b01ef01b9401918d54 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Fri, 4 Dec 2015 15:53:25 -0800
Subject: [PATCH] Fix GCC build.

  error: '__sdidinit' initialized and declared 'extern' [-Werror]

Change-Id: I97d9c174da6a99ca61b72572dfb4694813372a60
---
 libc/bionic/ndk_cruft.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp
index 6609470ef..0af9d5bc2 100644
--- a/libc/bionic/ndk_cruft.cpp
+++ b/libc/bionic/ndk_cruft.cpp
@@ -287,11 +287,12 @@ extern "C" int getdtablesize() {
 }
 
 // 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;