fix ups so we can compile GDAL-enabled build on windows too