mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

Cleanup the way we detect json-c library to use only pkg-config

Browse Source
This commit is contained in:
Ondřej Surý
2019-02-06 11:56:42 +01:00
parent d54f3f8b8c
commit 4d2d3b49ce
52 changed files with 342 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/isc/task.c
View File

@@ -74,7 +74,7 @@ typedef enum {
task_state_done
} task_state_t;
#if defined(HAVE_LIBXML2) || defined(HAVE_JSON)
#if defined(HAVE_LIBXML2) || defined(HAVE_JSON_C)
static const char *statenames[] = {
"idle", "ready", "running", "done",
};
@@ -1763,7 +1763,7 @@ isc_taskmgr_renderxml(isc_taskmgr_t *mgr0, xmlTextWriterPtr writer) {
}
#endif /* HAVE_LIBXML2 */
#ifdef HAVE_JSON
#ifdef HAVE_JSON_C
#define CHECKMEM(m) do { \
if (m == NULL) { \
result = ISC_R_NOMEMORY;\