commit a259472ca076ee230523e63502999be13a3f72d2
author Elliott Hughes <enh@google.com> Thu Sep 19 18:41:05 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 19 18:41:06 2013 +0000
tree c648306c9d0e01fb65cc1f73c8bf61d49889392f
parent 045f311b0a5b3ceed09dfc4b4246c99183a2cef4
parent edad1e1558bf5a561ffb33c5bf5ca0553711e1ee

Merge "Fix mismatch between declaration and forward declaration"

libc/bionic/libc_init_common.h

diff --git a/libc/bionic/libc_init_common.h b/libc/bionic/libc_init_common.h
index 14105f8..59dc7df 100644
--- a/libc/bionic/libc_init_common.h
+++ b/libc/bionic/libc_init_common.h
@@ -49,7 +49,7 @@
 __END_DECLS
 
 #if defined(__cplusplus)
-struct KernelArgumentBlock;
+class KernelArgumentBlock;
 void __LIBC_HIDDEN__ __libc_init_common(KernelArgumentBlock& args);
 #endif
 

libc/private/bionic_tls.h

diff --git a/libc/private/bionic_tls.h b/libc/private/bionic_tls.h
index d15b1ca..9ea3647 100644
--- a/libc/private/bionic_tls.h
+++ b/libc/private/bionic_tls.h
@@ -113,7 +113,7 @@
 __END_DECLS
 
 #if defined(__cplusplus)
-struct KernelArgumentBlock;
+class KernelArgumentBlock;
 extern __LIBC_HIDDEN__ void __libc_init_tls(KernelArgumentBlock& args);
 #endif