From 0615457dfa57c7a79e9e584d0e2ac876679be1a6 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Wed, 13 Dec 2017 15:43:36 +0100 Subject: [PATCH] Resolve constant conflict --- src/const-info.c | 8 ++++---- src/getdns/getdns_extra.h.in | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/const-info.c b/src/const-info.c index 9ffdba7c..41d1c091 100644 --- a/src/const-info.c +++ b/src/const-info.c @@ -89,8 +89,8 @@ static struct const_info consts_info[] = { { 628, "GETDNS_CONTEXT_CODE_APPDATA_DIR", GETDNS_CONTEXT_CODE_APPDATA_DIR_TEXT }, { 629, "GETDNS_CONTEXT_CODE_RESOLVCONF", GETDNS_CONTEXT_CODE_RESOLVCONF_TEXT }, { 630, "GETDNS_CONTEXT_CODE_HOSTS", GETDNS_CONTEXT_CODE_HOSTS_TEXT }, - { 630, "GETDNS_CONTEXT_CODE_CAPATH", GETDNS_CONTEXT_CODE_CAPATH_TEXT }, - { 631, "GETDNS_CONTEXT_CODE_CAFILE", GETDNS_CONTEXT_CODE_CAFILE_TEXT }, + { 631, "GETDNS_CONTEXT_CODE_CAPATH", GETDNS_CONTEXT_CODE_CAPATH_TEXT }, + { 632, "GETDNS_CONTEXT_CODE_CAFILE", GETDNS_CONTEXT_CODE_CAFILE_TEXT }, { 700, "GETDNS_CALLBACK_COMPLETE", GETDNS_CALLBACK_COMPLETE_TEXT }, { 701, "GETDNS_CALLBACK_CANCEL", GETDNS_CALLBACK_CANCEL_TEXT }, { 702, "GETDNS_CALLBACK_TIMEOUT", GETDNS_CALLBACK_TIMEOUT_TEXT }, @@ -161,8 +161,8 @@ static struct const_name_info consts_name_info[] = { { "GETDNS_CALLBACK_TIMEOUT", 702 }, { "GETDNS_CONTEXT_CODE_APPDATA_DIR", 628 }, { "GETDNS_CONTEXT_CODE_APPEND_NAME", 607 }, - { "GETDNS_CONTEXT_CODE_CAFILE", 631 }, - { "GETDNS_CONTEXT_CODE_CAPATH", 630 }, + { "GETDNS_CONTEXT_CODE_CAFILE", 632 }, + { "GETDNS_CONTEXT_CODE_CAPATH", 631 }, { "GETDNS_CONTEXT_CODE_DNSSEC_ALLOWED_SKEW", 614 }, { "GETDNS_CONTEXT_CODE_DNSSEC_TRUST_ANCHORS", 609 }, { "GETDNS_CONTEXT_CODE_DNS_ROOT_SERVERS", 604 }, diff --git a/src/getdns/getdns_extra.h.in b/src/getdns/getdns_extra.h.in index 3fe0a2c3..1c88813b 100644 --- a/src/getdns/getdns_extra.h.in +++ b/src/getdns/getdns_extra.h.in @@ -94,9 +94,9 @@ extern "C" { #define GETDNS_CONTEXT_CODE_RESOLVCONF_TEXT "Change related to getdns_context_set_resolvconf" #define GETDNS_CONTEXT_CODE_HOSTS 630 #define GETDNS_CONTEXT_CODE_HOSTS_TEXT "Change related to getdns_context_set_hosts" -#define GETDNS_CONTEXT_CODE_CAPATH 630 +#define GETDNS_CONTEXT_CODE_CAPATH 631 #define GETDNS_CONTEXT_CODE_CAPATH_TEXT "Change related to getdns_context_set_CApath" -#define GETDNS_CONTEXT_CODE_CAFILE 631 +#define GETDNS_CONTEXT_CODE_CAFILE 632 #define GETDNS_CONTEXT_CODE_CAFILE_TEXT "Change related to getdns_context_set_CAfile" /** @}