One additional change to fix __STDC_VERSION__ tests in Xfuncproto.h (also pushed upstreams). Tested and ok by krw@, shadchin@, landry@ (on a bulk ports build).