summaryrefslogtreecommitdiffstats
path: root/src/util
diff options
context:
space:
mode:
authorOBATA Akio <[email protected]>2019-09-16 16:39:32 +0900
committerMatt Turner <[email protected]>2019-10-09 13:01:17 -0700
commit1ee42583830facd9f903f431891d0400cee963cf (patch)
tree388e47c658f02fb871b847b09f47060fbeb9fade /src/util
parent6ea0a918bb87076e7d7f63314929760e6bc72041 (diff)
util: fix to detect NetBSD properly
<sys/param.h> is required for NetBSD version detection, and __NetBSD__ must be used to detect even on older releases. Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/util')
-rw-r--r--src/util/u_process.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/util/u_process.c b/src/util/u_process.c
index 371335303ec..b9328d58da4 100644
--- a/src/util/u_process.c
+++ b/src/util/u_process.c
@@ -87,8 +87,11 @@ __getProgramName()
# if (__FreeBSD_version >= 440000)
# define GET_PROGRAM_NAME() getprogname()
# endif
-#elif defined(__NetBSD__) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106000100)
-# define GET_PROGRAM_NAME() getprogname()
+#elif defined(__NetBSD__)
+# include <sys/param.h>
+# if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106000100)
+# define GET_PROGRAM_NAME() getprogname()
+# endif
#elif defined(__DragonFly__)
# define GET_PROGRAM_NAME() getprogname()
#elif defined(__APPLE__)
@@ -123,7 +126,7 @@ __getProgramName()
#endif
#if !defined(GET_PROGRAM_NAME)
-# if defined(__OpenBSD__) || defined(NetBSD) || defined(__UCLIBC__) || defined(ANDROID)
+# if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__UCLIBC__) || defined(ANDROID)
/* This is a hack. It's said to work on OpenBSD, NetBSD and GNU.
* Rogelio M.Serrano Jr. reported it's also working with UCLIBC. It's
* used as a last resort, if there is no documented facility available. */