Module Name: src
Committed By: uebayasi
Date: Wed Dec 10 07:43:34 UTC 2014
Modified Files:
src/external/bsd/dhcp/dist/includes/omapip: result.h
Log Message:
Don't define ISC_R_* symbols, that conflict with the newest bind.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/dhcp/dist/includes/omapip/result.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcp/dist/includes/omapip/result.h
diff -u src/external/bsd/dhcp/dist/includes/omapip/result.h:1.1.1.2 src/external/bsd/dhcp/dist/includes/omapip/result.h:1.2
--- src/external/bsd/dhcp/dist/includes/omapip/result.h:1.1.1.2 Sat Jul 12 11:57:57 2014
+++ src/external/bsd/dhcp/dist/includes/omapip/result.h Wed Dec 10 07:43:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: result.h,v 1.1.1.2 2014/07/12 11:57:57 spz Exp $ */
+/* $NetBSD: result.h,v 1.2 2014/12/10 07:43:34 uebayasi Exp $ */
/* result.h
*/
@@ -81,6 +81,7 @@
// Included for historical reasons, these should be removed as
// soon as reasonable
+#if 0
#define ISC_R_HOSTUNKNOWN DHCP_R_HOSTUNKNOWN
#define ISC_R_VERSIONMISMATCH DHCP_R_VERSIONMISMATCH
#define ISC_R_PROTOCOLERROR DHCP_R_PROTOCOLERROR
@@ -114,6 +115,7 @@
#define ISC_R_NOT_EQUAL DHCP_R_NOT_EQUAL
#define ISC_R_CONNRESET DHCP_R_CONNRESET
#define ISC_R_UNKNOWNATTRIBUTE DHCP_R_UNKNOWNATTRIBUTE
+#endif
isc_result_t
dhcp_result_register(void);
