bitcoin/bitcoin — pull request #3321 by Diapolo (2013-11-27 15:21:09+00:00)
Title: fix Windows redefinition warning in compat.h

- also remove compat.h include from net.h as it comes from netbase.h
(which is needed as base for net.h anyway)