diff options
| author | Shawn Routhier <sar@isc.org> | 2014-09-10 20:26:40 -0700 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2014-09-10 20:26:40 -0700 |
| commit | 1dceab6c75ce7bad309da9114d9e7f518291a955 (patch) | |
| tree | 5bc0288611b9db44906a78088a171956ed9cffdb /includes/omapip/result.h | |
| parent | 2a537542d6ab3d795fb9bab9b2990625d543ce41 (diff) | |
| download | isc-dhcp-1dceab6c75ce7bad309da9114d9e7f518291a955.tar.gz | |
[master] Remove unneeded defines for errors
As part of 4.2.0 we renamed a number of errors but continued
to include the old ones in case somebody was building something
using our libraries. This #ifdefs them and by defaults removes them
from the compile.
Diffstat (limited to 'includes/omapip/result.h')
| -rw-r--r-- | includes/omapip/result.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/includes/omapip/result.h b/includes/omapip/result.h index 3e4cf6a7..ae5f7d6a 100644 --- a/includes/omapip/result.h +++ b/includes/omapip/result.h @@ -2,7 +2,7 @@ */ /* - * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009,2014 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -80,13 +80,13 @@ // Included for historical reasons, these should be removed as // soon as reasonable +#ifdef INCLUDE_OLD_DHCP_ISC_ERROR_CODES #define ISC_R_HOSTUNKNOWN DHCP_R_HOSTUNKNOWN #define ISC_R_VERSIONMISMATCH DHCP_R_VERSIONMISMATCH #define ISC_R_PROTOCOLERROR DHCP_R_PROTOCOLERROR #define ISC_R_INVALIDARG DHCP_R_INVALIDARG #define ISC_R_NOTYET DHCP_R_NOTYET #define ISC_R_UNCHANGED DHCP_R_UNCHANGED -#define ISC_R_MULTIPLE DHCP_R_MULTIPLE #define ISC_R_KEYCONFLICT DHCP_R_KEYCONFLICT #define ISC_R_BADPARSE DHCP_R_BADPARSE #define ISC_R_NOKEYS DHCP_R_NOKEYS @@ -113,6 +113,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); |