am 1f262b35: Merge "Fix recv.cpp so it can build with clang."

* commit '1f262b35fef5108e3bd3fbea4b6aa1ce635767f9':
  Fix recv.cpp so it can build with clang.