Module Name: src Committed By: christos Date: Thu Dec 17 04:10:03 UTC 2015
Modified Files:
src/external/bsd/bind/include: config.h
src/external/bsd/bind/include/isc: platform.h
Log Message:
fix merge botches
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/bind/include/config.h
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/bind/include/isc/platform.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
