Build fixes for VS2013

These are some minor changes reportedly necessary for
building apitrace with VS2013.  Upstreaming these from Regal.

See also:
https://github.com/p3/regal/pull/97