CVS commit: src/sys

["Matthias Drochner" <drochner%netbsd.org@localhost>]

Module Name:    src
Committed By:   drochner
Date:           Wed Jan 11 14:37:45 UTC 2012

Modified Files:
        src/sys/dist/pf/net: pfvar.h
        src/sys/netipsec: keydb.h

Log Message:
protect "union sockaddr_union" from being defined twice by a CPP symbol
(copied from FreeBSD), allows coexistence of (FAST_)IPSEC and pf


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dist/pf/net/pfvar.h
cvs rdiff -u -r1.10 -r1.11 src/sys/netipsec/keydb.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.