99492506d8
This fixes inline build issues with clang. http://clang.llvm.org/compatibility.html#inline (cherry picked from commit 1d32894775edd1bacdbcb4b6c3e129841b637374)