From 4df6baa5ac4c9d96d5209b4f49390dc52a25f09d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
Date: Mon, 12 Feb 2018 19:22:53 -0500
Subject: CMake: Check for strerror_r() (HAVE_STRERROR_R and STRERROR_R_CHAR_P)

This check (AC_FUNC_STRERROR_R) was originally present in configure.in,
and was lost in the transition to CMake.
---
 src/util.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/util.cpp b/src/util.cpp
index 29aae39..60564a1 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -742,10 +742,10 @@ string to_printable(const string &s) {
 }
 
 string get_error_str(int errnum) {
-#if HAVE_STRERROR_R
+#ifdef HAVE_STRERROR_R
 	char buf[81];
 	memset(buf, 0, sizeof(buf));
-#if STRERROR_R_CHAR_P
+#ifdef STRERROR_R_CHAR_P
 	string errmsg(strerror_r(errnum, buf, sizeof(buf)-1));
 #else
 	string errmsg;
-- 
cgit v1.2.3


From 87e996aaebdae6e2f07c8aa650b4eebdd00f0cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= <fbriere@fbriere.net>
Date: Mon, 12 Feb 2018 19:28:16 -0500
Subject: CMake: Check for res_init() (HAVE_RES_INIT)

This check (AC_CHECK_RES_INIT) was originally defined in acinclude.m4,
and was lost in the transition to CMake.
---
 src/sockets/dnssrv.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/sockets/dnssrv.cpp b/src/sockets/dnssrv.cpp
index 38cd61d..246bf02 100644
--- a/src/sockets/dnssrv.cpp
+++ b/src/sockets/dnssrv.cpp
@@ -11,6 +11,7 @@
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#include "twinkle_config.h"
 #include <resolv.h>
 #include <errno.h>
 #include <stdlib.h>
-- 
cgit v1.2.3