Oops; fix a merge conflict that got committed into event2/event-config.h. Now msvc builds work again.