am 8ff879a5: am a259472c: Merge "Fix mismatch between declaration and forward declaration"

* commit '8ff879a528b8876db811f5abd4dbf0640e3a0408':
  Fix mismatch between declaration and forward declaration
This commit is contained in:
Elliott Hughes 2013-09-19 11:46:46 -07:00 committed by Android Git Automerger
commit a3285dc914
2 changed files with 2 additions and 2 deletions

View File

@ -49,7 +49,7 @@ void __libc_fini(void* finit_array);
__END_DECLS __END_DECLS
#if defined(__cplusplus) #if defined(__cplusplus)
struct KernelArgumentBlock; class KernelArgumentBlock;
void __LIBC_HIDDEN__ __libc_init_common(KernelArgumentBlock& args); void __LIBC_HIDDEN__ __libc_init_common(KernelArgumentBlock& args);
#endif #endif

View File

@ -113,7 +113,7 @@ extern int __set_tls(void* ptr);
__END_DECLS __END_DECLS
#if defined(__cplusplus) #if defined(__cplusplus)
struct KernelArgumentBlock; class KernelArgumentBlock;
extern __LIBC_HIDDEN__ void __libc_init_tls(KernelArgumentBlock& args); extern __LIBC_HIDDEN__ void __libc_init_tls(KernelArgumentBlock& args);
#endif #endif