Use a newer version of the clang-format tool to format the code. Changes are minor but there is an improved handling of comments directly preceding an #ifdef.
clang-format