From ee87838786cef0194db36ae0675b3e7c4e8ec661 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 22 Jan 2014 16:30:15 +1100
Subject:  - (djm) [openbsd-compat/setproctitle.c] Don't fail to compile if a  
  platform that is expected to use the reuse-argv style setproctitle    hack
 surprises us by providing a setproctitle in libc; ok dtucker

---
 openbsd-compat/setproctitle.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'openbsd-compat/setproctitle.c')

diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c
index a69db22a2..9f7ca14c2 100644
--- a/openbsd-compat/setproctitle.c
+++ b/openbsd-compat/setproctitle.c
@@ -67,7 +67,8 @@ static size_t argv_env_len = 0;
 void
 compat_init_setproctitle(int argc, char *argv[])
 {
-#if defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV
+#if !defined(HAVE_SETPROCTITLE) && \
+    defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV
 	extern char **environ;
 	char *lastargv = NULL;
 	char **envp = environ;
-- 
cgit v1.2.3