Merge: Fix obvious compilation breakage on win32 in previous version.