From 18e82cc6b94c292952a0249eba759216f041ccd3 Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Wed, 22 Jan 2014 05:30:15 +0000
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

---
 ChangeLog                     | 5 +++++
 openbsd-compat/setproctitle.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8010f8b4..479221af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20130122
+ - (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
+
 20140121
  - (dtucker) [configure.ac] Make PIE a configure-time option which defaults
    to on platforms where it's known to be reliably detected and off elsewhere.
diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c
index a69db22a..9f7ca14c 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.1