Merge "fix extern C decl"