Bug 1003230 - Fix windows build errors caused by changeset e7e6db764418 r=bustage on a CLOSED TREE