summaryrefslogtreecommitdiffstats
path: root/openbsd-compat/setproctitle.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-01-20 13:15:10 +1100
committerDamien Miller <djm@mindrot.org>2003-01-20 13:15:10 +1100
commit140344b8097ccf596b40131c1b22bef8139631f4 (patch)
tree62b6af6f4984edcd28ac533bd9ec61065ea03f03 /openbsd-compat/setproctitle.c
parente443e9398eb95f95bee82009cfae30951646c6e9 (diff)
- (djm) Fix compilation for NetBSD from dtucker@zip.com.au
Diffstat (limited to 'openbsd-compat/setproctitle.c')
-rw-r--r--openbsd-compat/setproctitle.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c
index 14d5d2f3..07af7e9c 100644
--- a/openbsd-compat/setproctitle.c
+++ b/openbsd-compat/setproctitle.c
@@ -31,7 +31,7 @@
* to contain some useful information. Mechanism differs wildly across
* platforms.
*
- * $Header: /var/cvs/openssh/openbsd-compat/setproctitle.c,v 1.4 2003/01/12 23:04:59 djm Exp $
+ * $Header: /var/cvs/openssh/openbsd-compat/setproctitle.c,v 1.5 2003/01/20 02:15:11 djm Exp $
*
* Copyright 2000 by PostgreSQL Global Development Group
* various details abducted from various places
@@ -51,8 +51,6 @@
#include <sys/exec.h>
#endif
-extern char **environ;
-
/*------
* Alternative ways of updating ps display:
*
@@ -86,6 +84,9 @@ extern char **environ;
#ifndef SETPROCTITLE_PS_PADDING
# define SETPROCTITLE_PS_PADDING ' '
#endif
+#endif /* HAVE_SETPROCTITLE */
+
+extern char **environ;
/*
* argv clobbering uses existing argv space, all other methods need a buffer
@@ -104,6 +105,7 @@ static char **save_argv;
extern char *__progname;
+#ifndef HAVE_SETPROCTITLE
/*
* Call this to update the ps status display to a fixed prefix plus an
* indication of what you're currently doing passed in the argument.