tobhe Fix build with older gcc. Put variable declaration in scope.