NET - created s_addr define to fix windows naming inconsistency
Merge branch 'master' of https://github.com/ccore/ccore