fix ifdef logic
benchmark: fix iterator advance
Merge branch 'master' of github.com:mapnik/mapnik