ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Do not require config.h to use isc/util.h

Browse Source 
util.h requires ISC_CONSTRUCTOR definition, which depends on config.h
inclusion. It does not include it from isc/util.h (or any other header).
Using isc/util.h fails hard when isc/util.h is used without including
bind's config.h.

Move the check to c file, where ISC_CONSTRUCTOR is used. Ensure config.h
is included there.
This commit is contained in:
Petr Mensik
2021-03-26 11:01:59 +01:00
committed by Petr Menšík
parent f38069cdf8
commit 81eb3396bf
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/isc/include/isc/util.h
View File

@@ -54,8 +54,6 @@
#elif WIN32 #elif WIN32
#define ISC_CONSTRUCTOR(priority) #define ISC_CONSTRUCTOR(priority)
#define ISC_DESTRUCTOR(priority) #define ISC_DESTRUCTOR(priority)
#else
#error Either __attribute__((constructor|destructor))__ or DllMain support needed to compile BIND 9.
#endif #endif
/*% /*%

5
lib/isc/lib.c
View File

@@ -17,10 +17,15 @@
#include <isc/tls.h> #include <isc/tls.h>
#include <isc/util.h> #include <isc/util.h>
#include "config.h"
#include "mem_p.h" #include "mem_p.h"
#include "tls_p.h" #include "tls_p.h"
#include "trampoline_p.h" #include "trampoline_p.h"
#ifndef ISC_CONSTRUCTOR
#error Either __attribute__((constructor|destructor))__ or DllMain support needed to compile BIND 9.
#endif
/*** /***
*** Functions *** Functions
***/ ***/