add Pierre's config.w32 fixes to R_1_6