uplink: Fix build on macos, struct stat has different member fields

Author: hessu

src/configure.ac

@@ -69,7 +69,7 @@ AC_CHECK_HEADERS([sys/prctl.h], AC_DEFINE([HAVE_PRCTL_H], [], [Linux process con
 AC_SUBST(LIBCAP)
 AC_CHECK_LIB(cap,cap_init,[LIBCAP="-lcap"])
 
-dnl Check for 
+dnl Check for eventfd on Linux
 AC_CHECK_HEADERS([sys/eventfd.h], AC_DEFINE([HAVE_EVENTFD_H], [], [Linux event fd support]))
 
 dnl Checks for system headers
@@ -78,6 +78,9 @@ AC_CHECK_HEADERS([poll.h],      AC_DEFINE([HAVE_POLL_H]))
 dnl AC_CHECK_FUNC(ppoll,,[Probably have ppoll of Linux])
 AC_CHECK_HEADERS([sys/epoll.h], AC_DEFINE([HAVE_SYS_EPOLL_H]))
 
+dnl Check for MacOS struct stat
+AC_CHECK_MEMBER([struct stat.st_mtimespec], AC_DEFINE([HAVE_STAT_ST_MTIMESPEC], [], [MacOS struct stat.st_mtimespec]))
+
 dnl SCTP checks
 AC_CHECK_HEADERS([netinet/sctp.h], AC_DEFINE([HAVE_NETINET_SCTP_H]))
 

src/uplink.c

@@ -80,11 +80,18 @@ void consider_res_init(void) {
 		hlog(LOG_WARNING, "Failed to stat " RESOLV_CONF_PATH ": %s", strerror(errno));
 		return;
 	}
-	if (resolvconf_mtim.tv_sec == resolvconf_stat.st_mtim.tv_sec
-	    && resolvconf_mtim.tv_nsec == resolvconf_stat.st_mtim.tv_nsec) {
+
+#ifdef HAVE_STAT_ST_MTIMESPEC
+#define ST_MTIMESPEC st_mtimespec
+#else
+#define ST_MTIMESPEC st_mtim
+#endif
+
+	if (resolvconf_mtim.tv_sec == resolvconf_stat.ST_MTIMESPEC.tv_sec
+	    && resolvconf_mtim.tv_nsec == resolvconf_stat.ST_MTIMESPEC.tv_nsec) {
 	    	return;
 	}
-	resolvconf_mtim = resolvconf_stat.st_mtim;
+	resolvconf_mtim = resolvconf_stat.ST_MTIMESPEC;
 
 	// only log on repeated inits; otherwise would be logged on every startup
 	if (resolvconf_reread)