diff --git a/src/const-info.c b/src/const-info.c index 4c472dab..2dce8bf9 100644 --- a/src/const-info.c +++ b/src/const-info.c @@ -1,8 +1,8 @@ /* WARNING! This file is generated by the mk-const-info.c.sh program. * Do not edit manually! */ -#include #include +#include "getdns/getdns.h" #include "const-info.h" static struct const_info consts_info[] = { diff --git a/src/context.c b/src/context.c index 19e57421..9a7f68a8 100644 --- a/src/context.c +++ b/src/context.c @@ -34,7 +34,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include #include #include @@ -45,6 +44,7 @@ #include #include +#include "config.h" #include "context.h" #include "types-internal.h" #include "util-internal.h" diff --git a/src/context.h b/src/context.h index bafe119d..036f1462 100644 --- a/src/context.h +++ b/src/context.h @@ -37,8 +37,8 @@ #ifndef _GETDNS_CONTEXT_H_ #define _GETDNS_CONTEXT_H_ -#include -#include +#include "getdns/getdns.h" +#include "getdns/getdns_extra.h" #include "types-internal.h" struct getdns_dns_req; diff --git a/src/convert.c b/src/convert.c index 1f2940c2..8fad6e10 100644 --- a/src/convert.c +++ b/src/convert.c @@ -32,14 +32,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include -#include #include #include #include #include +#include "getdns/getdns.h" +#include "util-internal.h" #include "getdns_error.h" /* stuff to make it compile pedantically */ diff --git a/src/dict.h b/src/dict.h index 29678c9b..abc38613 100644 --- a/src/dict.h +++ b/src/dict.h @@ -35,8 +35,8 @@ #ifndef _GETDNS_DICT_H_ #define _GETDNS_DICT_H_ -#include #include +#include "getdns/getdns.h" #include "types-internal.h" union getdns_item diff --git a/src/dnssec.c b/src/dnssec.c index 28692f59..5006caf5 100644 --- a/src/dnssec.c +++ b/src/dnssec.c @@ -40,7 +40,7 @@ #include #include #include -#include +#include "getdns/getdns.h" #include "config.h" #include "context.h" #include "util-internal.h" diff --git a/src/extension/libev.c b/src/extension/libev.c index 7d34a1ac..f043a45b 100644 --- a/src/extension/libev.c +++ b/src/extension/libev.c @@ -33,10 +33,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include +#include "getdns/getdns_ext_libev.h" #define RETURN_IF_NULL(ptr, code) if(ptr == NULL) return code; diff --git a/src/extension/libevent.c b/src/extension/libevent.c index 805128f4..dcccd636 100644 --- a/src/extension/libevent.c +++ b/src/extension/libevent.c @@ -33,9 +33,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include "config.h" #include +#include "getdns/getdns_ext_libevent.h" +#include "config.h" #ifdef HAVE_EVENT2_EVENT_H # include diff --git a/src/extension/libuv.c b/src/extension/libuv.c index 05ddcf53..687ae9bb 100644 --- a/src/extension/libuv.c +++ b/src/extension/libuv.c @@ -33,10 +33,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include +#include "getdns/getdns_ext_libuv.h" #define RETURN_IF_NULL(ptr, code) if(ptr == NULL) return code; diff --git a/src/general.c b/src/general.c index d04fb57f..d3ac3942 100644 --- a/src/general.c +++ b/src/general.c @@ -35,15 +35,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" +#include #include #include #include +#include "config.h" #include "context.h" #include "types-internal.h" #include "util-internal.h" #include "dnssec.h" -#include /* stuff to make it compile pedantically */ #define UNUSED_PARAM(x) ((void)(x)) diff --git a/src/general.h b/src/general.h index b533d8bd..91c00fc0 100644 --- a/src/general.h +++ b/src/general.h @@ -36,7 +36,7 @@ #ifndef _GETDNS_GENERAL_H_ #define _GETDNS_GENERAL_H_ -#include +#include "getdns/getdns.h" #include "types-internal.h" /* private inner helper used by sync and async */ diff --git a/src/getdns_error.c b/src/getdns_error.c index 5dedc01a..4c2fdfe5 100644 --- a/src/getdns_error.c +++ b/src/getdns_error.c @@ -31,7 +31,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "getdns/getdns.h" #include "const-info.h" /*---------------------------------------- getdns_get_errorstr_by_id() */ diff --git a/src/getdns_error.h b/src/getdns_error.h index aa492fac..ef9bf114 100644 --- a/src/getdns_error.h +++ b/src/getdns_error.h @@ -35,7 +35,7 @@ #ifndef GETDNS_ERROR_H #define GETDNS_ERROR_H -#include +#include "getdns/getdns.h" const char *getdns_get_errorstr_by_id(uint16_t err); diff --git a/src/hostname.c b/src/hostname.c index 1cba1cbd..7faab768 100644 --- a/src/hostname.c +++ b/src/hostname.c @@ -35,12 +35,12 @@ */ -#include +#include +#include "getdns/getdns.h" #include "context.h" #include "general.h" #include "util-internal.h" #include "types-internal.h" -#include /* stuff to make it compile pedantically */ #define UNUSED_PARAM(x) ((void)(x)) diff --git a/src/list.h b/src/list.h index 4d9d91ad..0fc320a4 100644 --- a/src/list.h +++ b/src/list.h @@ -37,7 +37,7 @@ #ifndef _GETDNS_LIST_H_ #define _GETDNS_LIST_H_ -#include +#include "getdns/getdns.h" #include "types-internal.h" #define GETDNS_LIST_BLOCKSZ 10 diff --git a/src/mk-const-info.c.sh b/src/mk-const-info.c.sh index dc341e78..9256d305 100755 --- a/src/mk-const-info.c.sh +++ b/src/mk-const-info.c.sh @@ -4,14 +4,14 @@ cat > const-info.c << END_OF_HEAD /* WARNING! This file is generated by the mk-const-info.c.sh program. * Do not edit manually! */ -#include #include +#include "getdns/getdns.h" #include "const-info.h" static struct const_info consts_info[] = { { -1, NULL, "/* */" }, END_OF_HEAD -awk '/^[ ]+GETDNS_[A-Z_]+[ ]+=[ ]+[0-9]+/{ print "\t{ "$3", \""$1"\", "$1"_TEXT }," }/^#define GETDNS_[A-Z_]+[ ]+[0-9]+/ && !/^#define GETDNS_RRTYPE/ && !/_TEXT/{ print "\t{ "$3", \""$2"\", "$2"_TEXT },"}' getdns/getdns.h | sed 's/,,/,/g' >> const-info.c +awk '/^[ ]+GETDNS_[A-Z_]+[ ]+=[ ]+[0-9]+/{ print "\t{ "$3", \""$1"\", "$1"_TEXT }," }/^#define GETDNS_[A-Z_]+[ ]+[0-9]+/ && !/^#define GETDNS_RRTYPE/ && !/^#define GETDNS_RRCLASS/ && !/^#define GETDNS_OPCODE/ && !/^#define GETDNS_RCODE/ && !/_TEXT/{ print "\t{ "$3", \""$2"\", "$2"_TEXT },"}' getdns/getdns.h.in | sed 's/,,/,/g' >> const-info.c cat >> const-info.c << END_OF_TAIL }; diff --git a/src/rr-dict.h b/src/rr-dict.h index abb7463e..e9a751b3 100644 --- a/src/rr-dict.h +++ b/src/rr-dict.h @@ -32,8 +32,8 @@ #ifndef RR_DICT_H_ #define RR_DICT_H_ -#include #include +#include "getdns/getdns.h" getdns_return_t priv_getdns_create_dict_from_rr( struct getdns_context *context, ldns_rr *rr, struct getdns_dict** rr_dict); diff --git a/src/service.c b/src/service.c index b1e8ff2f..18c795ad 100644 --- a/src/service.c +++ b/src/service.c @@ -34,7 +34,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "getdns/getdns.h" #include "general.h" #include "util-internal.h" diff --git a/src/sync.c b/src/sync.c index 3f89c01d..10c0dcad 100644 --- a/src/sync.c +++ b/src/sync.c @@ -33,14 +33,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" -#include +#include #include +#include "getdns/getdns.h" +#include "config.h" #include "context.h" #include "general.h" #include "types-internal.h" #include "util-internal.h" -#include #include "dnssec.h" /* stuff to make it compile pedantically */ diff --git a/src/test/check_getdns.c b/src/test/check_getdns.c index 4967a79d..0f138b4b 100644 --- a/src/test/check_getdns.c +++ b/src/test/check_getdns.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include "getdns/getdns.h" #include "check_getdns_common.h" #include "check_getdns_general.h" #include "check_getdns_general_sync.h" diff --git a/src/test/check_getdns_common.c b/src/test/check_getdns_common.c index f122d1fa..38a9fed3 100644 --- a/src/test/check_getdns_common.c +++ b/src/test/check_getdns_common.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include "getdns/getdns.h" #include "config.h" #include "check_getdns_common.h" #include "check_getdns_eventloop.h" diff --git a/src/test/check_getdns_common.h b/src/test/check_getdns_common.h index 4639ec39..0e05e8d1 100644 --- a/src/test/check_getdns_common.h +++ b/src/test/check_getdns_common.h @@ -27,7 +27,7 @@ #ifndef _check_getdns_common_h_ #define _check_getdns_common_h_ -#include +#include "getdns/getdns.h" #define TRUE 1 #define FALSE 0 diff --git a/src/test/check_getdns_libev.c b/src/test/check_getdns_libev.c index 49be53bc..e472b487 100644 --- a/src/test/check_getdns_libev.c +++ b/src/test/check_getdns_libev.c @@ -35,7 +35,7 @@ #include "check_getdns_eventloop.h" -#include +#include "getdns/getdns_ext_libev.h" #include #include #include "check_getdns_common.h" diff --git a/src/test/check_getdns_libevent.c b/src/test/check_getdns_libevent.c index e9bf2988..8afc8a47 100644 --- a/src/test/check_getdns_libevent.c +++ b/src/test/check_getdns_libevent.c @@ -35,7 +35,7 @@ #include "check_getdns_eventloop.h" -#include +#include "getdns/getdns_ext_libevent.h" #include "check_getdns_libevent.h" #include #include "check_getdns_common.h" diff --git a/src/test/check_getdns_libuv.c b/src/test/check_getdns_libuv.c index 209cbe46..256adda7 100644 --- a/src/test/check_getdns_libuv.c +++ b/src/test/check_getdns_libuv.c @@ -35,7 +35,7 @@ #include "check_getdns_eventloop.h" -#include +#include "getdns/getdns_ext_libuv.h" #include #include #include "check_getdns_common.h" diff --git a/src/test/check_getdns_selectloop.c b/src/test/check_getdns_selectloop.c index 3baf3b9a..f4255a32 100644 --- a/src/test/check_getdns_selectloop.c +++ b/src/test/check_getdns_selectloop.c @@ -34,7 +34,7 @@ */ #include "check_getdns_eventloop.h" -#include +#include "getdns/getdns_extra.h" void run_event_loop_impl(struct getdns_context* context, void* eventloop) { struct timeval tv; diff --git a/src/test/tests_dict.c b/src/test/tests_dict.c index de12c621..1b7c9d98 100644 --- a/src/test/tests_dict.c +++ b/src/test/tests_dict.c @@ -36,7 +36,7 @@ #include #include #include "testmessages.h" -#include +#include "getdns/getdns.h" #define TSTMSGBUF 80 diff --git a/src/test/tests_dnssec.c b/src/test/tests_dnssec.c index 3c42636b..d6476d7c 100644 --- a/src/test/tests_dnssec.c +++ b/src/test/tests_dnssec.c @@ -38,8 +38,8 @@ #include #include #include "testmessages.h" -#include -#include +#include "getdns/getdns.h" +#include "getdns/getdns_extra.h" /* Set up the callback function, which will also do the processing of the results */ void diff --git a/src/test/tests_list.c b/src/test/tests_list.c index ca9a9600..159d854e 100644 --- a/src/test/tests_list.c +++ b/src/test/tests_list.c @@ -36,7 +36,7 @@ #include #include #include "testmessages.h" -#include +#include "getdns/getdns.h" #define TSTMSGBUF 80 #define GETDNS_LIST_BLOCKSZ 10 diff --git a/src/test/tests_stub_async.c b/src/test/tests_stub_async.c index 94345338..bb3a8a3d 100644 --- a/src/test/tests_stub_async.c +++ b/src/test/tests_stub_async.c @@ -37,8 +37,8 @@ #include #include #include "testmessages.h" -#include -#include +#include "getdns/getdns.h" +#include "getdns/getdns_extra.h" #include /* Set up the callback function, which will also do the processing of the results */ diff --git a/src/test/tests_stub_sync.c b/src/test/tests_stub_sync.c index bc092bb9..b9226a03 100644 --- a/src/test/tests_stub_sync.c +++ b/src/test/tests_stub_sync.c @@ -36,7 +36,7 @@ #include #include #include "testmessages.h" -#include +#include "getdns/getdns.h" static void print_response(struct getdns_dict * response) diff --git a/src/types-internal.h b/src/types-internal.h index 90a3f8ee..c2e020e6 100644 --- a/src/types-internal.h +++ b/src/types-internal.h @@ -36,9 +36,9 @@ #ifndef TYPES_INTERNAL_H_ #define TYPES_INTERNAL_H_ -#include #include #include +#include "getdns/getdns.h" struct getdns_context; /** diff --git a/src/util-internal.c b/src/util-internal.c index 7a7c8710..dc23563b 100644 --- a/src/util-internal.c +++ b/src/util-internal.c @@ -35,13 +35,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "getdns/getdns.h" +#include +#include #include +#include +#include "getdns/getdns.h" #include "dict.h" #include "list.h" #include "util-internal.h" #include "types-internal.h" -#include #include "rr-dict.h" /**