[PD-dev] recent CVS commits for win32 compilability