Had to fix a few preprocessor related issues in "src/event-msw.c".  In addition, I'm attaching another patch (for "src/buffer.c") I sent a month or so ago, but haven't seen checked in.
 
-lipp