Thanks for the notes - I've pushed an updated version that includes the (hopefully) corrected #if / #pragma usage to remain compatible on windows, broke the long line & resolved the merge conflict against the latest HEAD of feature/native-comp.
I also just got word from the FSF that my copyright assignment for GNU Emacs is completed (and received the countersigned assignment papers as PDF) - if the patch looks good to you, I think legally you're ok to merge (-:
Cheers,
--