-fpermissive only applies to C++ files.
Merge remote-tracking branch 'upstream/master'