[sr-dev] git:master: avp_db(s): gcc 2.9x var decls. fixes