- (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

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8010f8b40..479221afb 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 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;