mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +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

6
lib/isc/unix/socket.c
View File

@@ -5391,7 +5391,7 @@ isc_socket_hasreuseport() {
}
#if defined(HAVE_LIBXML2) || defined(HAVE_JSON)
#if defined(HAVE_LIBXML2) || defined(HAVE_JSON_C)
static const char *
_socktype(isc_sockettype_t type)
{
@@ -5501,7 +5501,7 @@ isc_socketmgr_renderxml(isc_socketmgr_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;\
@@ -5616,7 +5616,7 @@ isc_socketmgr_renderjson(isc_socketmgr_t *mgr0, json_object *stats) {
return (result);
}
#endif /* HAVE_JSON */
#endif /* HAVE_JSON_C */
isc_result_t
isc_socketmgr_createinctx(isc_mem_t *mctx, isc_socketmgr_t **managerp)