Move unrelated variable declaration out of #ifdef FEATURE_ACL; fixes bug #636655