Fixed compile for vs2012

The last patch broke the build on vs2012, while working for vs2013.  In
this version, it works properly with either.