• johan's avatar
    Fix merge · f942fdeb
    johan authored
    and make code C90 compliant
    f942fdeb