added TCP4Socket
fixed typo in various guard macros