winpr: fix conflict with SAL on OS X
Merge branch 'master' of github.com:awakecoding/FreeRDP into channels
mfreerdp-server: fix after changes to virtual channels