This update also fixes the build with clang. Reported by: Kevin Zheng <kevinz5000@gmail.com> [1] Approved by: crees (mentor)