From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 5 Aug 2000 01:54:34 +0000 (-0000)
Subject: strdup.c:
X-Git-Tag: NTP_4_0_99_M~227
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=363412ea494cbb5c6eacb166b88939e50b9801b5;p=thirdparty%2Fntp.git

strdup.c:
  Added NULL definition
refclock_oncore.c:
  Fix a cast

bk: 398b73daeQz6-hNDyCXLN1sPxZ8EAQ
---

diff --git a/libntp/strdup.c b/libntp/strdup.c
index 1d4f8f0ff3..08ffc2ff03 100644
--- a/libntp/strdup.c
+++ b/libntp/strdup.c
@@ -1,3 +1,6 @@
+
+#define NULL 0
+
 char *
 strdup(
 	const char *s
diff --git a/ntpd/refclock_oncore.c b/ntpd/refclock_oncore.c
index 7b468a2bc8..8078ef7e09 100644
--- a/ntpd/refclock_oncore.c
+++ b/ntpd/refclock_oncore.c
@@ -1059,7 +1059,7 @@ oncore_init_shmem(
 #endif
 			       MAP_SHARED,
 	    instance->statusfd, (off_t)0);
-	if (instance->shmem == MAP_FAILED) {
+	if (instance->shmem == (u_char *)MAP_FAILED) {
 		instance->shmem = 0;
 		close (instance->statusfd);
 		exit(4);