Merge "Fix OpenSLES_AndroidConfiguration.h to be usable for C code"

Andrew Hsieh · Gerrit Code Review · commit 342a2ae9f288 · 2013-03-14T20:27:55.000Z
diff --git a/ndk/platforms/android-9/include/SLES/OpenSLES_AndroidConfiguration.h b/ndk/platforms/android-9/include/SLES/OpenSLES_AndroidConfiguration.h
@@ -19,6 +19,7 @@
 
 #ifdef __cplusplus
 extern "C" {
+#endif
 
 /*---------------------------------------------------------------------------*/
 /* Android AudioRecorder configuration                                       */
@@ -63,6 +64,7 @@ extern "C" {
 
 
 
+#ifdef __cplusplus
 }
 #endif /* __cplusplus */
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`#ifdef __cplusplus`
`21`	`21`	`extern "C" {`
	`22`	`+#endif`
`22`	`23`
`23`	`24`	`/---------------------------------------------------------------------------/`
`24`	`25`	`/* Android AudioRecorder configuration */`
`@@ -63,6 +64,7 @@ extern "C" {`
`63`	`64`
`64`	`65`
`65`	`66`
	`67`	`+#ifdef __cplusplus`
`66`	`68`	`}`
`67`	`69`	`#endif /* __cplusplus */`
`68`	`70`