Make c89 compliant

Make c89 compliant