[src/trunk]: src/external/bsd/dhcp/dist/includes/omapip Don't define ISC_R_* ...

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/73851a7e9c90
branches:  trunk
changeset: 804989:73851a7e9c90
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Wed Dec 10 07:43:34 2014 +0000

description:
Don't define ISC_R_* symbols, that conflict with the newest bind.

diffstat:

 external/bsd/dhcp/dist/includes/omapip/result.h |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r a48ca44cb2f5 -r 73851a7e9c90 external/bsd/dhcp/dist/includes/omapip/result.h
--- a/external/bsd/dhcp/dist/includes/omapip/result.h   Wed Dec 10 04:42:24 2014 +0000
+++ b/external/bsd/dhcp/dist/includes/omapip/result.h   Wed Dec 10 07:43:34 2014 +0000
@@ -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);