C99 compatibility fixes
    
    Backport an upstream patch to the bundled previous version,
    and apply a new patch to fix compilation errors with future compilers.
    
    Related to:
    
      <https://fedoraproject.org/wiki/Changes/PortingToModernC>
      <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>