Upstream dropped std=c99 from compiler flags and fixed code which required c99 support to be enabled, upstream commit d0448d. Fixup our patch, thus it applies cleanly. Dropped unnecessary patch.
Resolves: #846018