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 1d4f8f0ff3dc89e89b0bf3bf14b356ab11b151d2..08ffc2ff031ebd159e60897f65e6e4f36e77a06a 100644 (file)
--- 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 7b468a2bc81d6a63b6cb7cef9d8e8b5ea3dc7610..8078ef7e0945263602dd0b33796dc3ac67c317be 100644 (file)
--- 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);