#45: Fix minor compile errors in Windows
 #46: Fix build errors on Windows.
Merge branch '46-add-niftk-socket' into test-upstream-tickets-merged2
Merge branch '45-time-stamp-windows' into test-upstream-tickets-merged2