From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Mon, 10 Aug 2015 15:32:34 +0000 (+0200)
Subject: sys: define NETBSD macro on NetBSD
X-Git-Tag: 2.2-pre1~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18d514d55272e0895dd9bf40f81ded7c9d857ede;p=thirdparty%2Fchrony.git

sys: define NETBSD macro on NetBSD
---

diff --git a/configure b/configure
index 4942722c..ed0d7952 100755
--- a/configure
+++ b/configure
@@ -401,7 +401,7 @@ case $SYSTEM in
     NetBSD-* )
         EXTRA_OBJECTS="sys_netbsd.o"
         EXTRA_LIBS="-lkvm"
-        SYSDEFS=""
+        add_def NETBSD
         echo "Configuring for $SYSTEM"
     ;;
     Darwin-* )
diff --git a/sys.c b/sys.c
index a407fb68..9de9ee14 100644
--- a/sys.c
+++ b/sys.c
@@ -44,7 +44,7 @@
 #include "sys_sunos.h"
 #endif
 
-#if defined (__NetBSD__)
+#if defined (NETBSD)
 #include "sys_netbsd.h"
 #endif
 
@@ -70,7 +70,7 @@ SYS_Initialise(void)
   SYS_SunOS_Initialise();
 #endif
 
-#if defined(__NetBSD__)
+#if defined(NETBSD)
   SYS_NetBSD_Initialise();
 #endif
 
@@ -98,7 +98,7 @@ SYS_Finalise(void)
   SYS_SunOS_Finalise();
 #endif
 
-#if defined(__NetBSD__)
+#if defined(NETBSD)
   SYS_NetBSD_Finalise();
 #endif
 
diff --git a/sys_netbsd.c b/sys_netbsd.c
index 237f35f5..9c3e1ef3 100644
--- a/sys_netbsd.c
+++ b/sys_netbsd.c
@@ -27,7 +27,7 @@
 
 #include "config.h"
 
-#ifdef __NetBSD__
+#ifdef NETBSD
 
 #include <kvm.h>
 #include <nlist.h>
@@ -325,4 +325,4 @@ SYS_NetBSD_Finalise(void)
 /* ================================================== */
 
 
-#endif /* __NetBSD__ */
+#endif /* NETBSD */
diff --git a/sysincl.h b/sysincl.h
index 31ddde49..81ae97e5 100644
--- a/sysincl.h
+++ b/sysincl.h
@@ -29,7 +29,7 @@
 #ifndef GOT_SYSINCL_H
 #define GOT_SYSINCL_H
 
-#if defined (SOLARIS) || defined(SUNOS) || defined(LINUX) || defined(__NetBSD__) || defined (MACOSX)
+#if defined (SOLARIS) || defined(SUNOS) || defined(LINUX) || defined(NETBSD) || defined (MACOSX)
 
 #if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(MACOSX)
 #include <alloca.h>