ifdef around Winsock headers to prevent collisions in the normal case
Merge pull request #13 from ooeygui/develop

ifdef around Winsock headers to prevent collisions in the normal case