diff options
author | Damien Miller <djm@mindrot.org> | 2003-01-20 13:15:10 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-01-20 13:15:10 +1100 |
commit | 140344b8097ccf596b40131c1b22bef8139631f4 (patch) | |
tree | 62b6af6f4984edcd28ac533bd9ec61065ea03f03 /openbsd-compat | |
parent | e443e9398eb95f95bee82009cfae30951646c6e9 (diff) |
- (djm) Fix compilation for NetBSD from dtucker@zip.com.au
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/setproctitle.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c index 14d5d2f3c..07af7e9c0 100644 --- a/openbsd-compat/setproctitle.c +++ b/openbsd-compat/setproctitle.c | |||
@@ -31,7 +31,7 @@ | |||
31 | * to contain some useful information. Mechanism differs wildly across | 31 | * to contain some useful information. Mechanism differs wildly across |
32 | * platforms. | 32 | * platforms. |
33 | * | 33 | * |
34 | * $Header: /var/cvs/openssh/openbsd-compat/setproctitle.c,v 1.4 2003/01/12 23:04:59 djm Exp $ | 34 | * $Header: /var/cvs/openssh/openbsd-compat/setproctitle.c,v 1.5 2003/01/20 02:15:11 djm Exp $ |
35 | * | 35 | * |
36 | * Copyright 2000 by PostgreSQL Global Development Group | 36 | * Copyright 2000 by PostgreSQL Global Development Group |
37 | * various details abducted from various places | 37 | * various details abducted from various places |
@@ -51,8 +51,6 @@ | |||
51 | #include <sys/exec.h> | 51 | #include <sys/exec.h> |
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | extern char **environ; | ||
55 | |||
56 | /*------ | 54 | /*------ |
57 | * Alternative ways of updating ps display: | 55 | * Alternative ways of updating ps display: |
58 | * | 56 | * |
@@ -86,6 +84,9 @@ extern char **environ; | |||
86 | #ifndef SETPROCTITLE_PS_PADDING | 84 | #ifndef SETPROCTITLE_PS_PADDING |
87 | # define SETPROCTITLE_PS_PADDING ' ' | 85 | # define SETPROCTITLE_PS_PADDING ' ' |
88 | #endif | 86 | #endif |
87 | #endif /* HAVE_SETPROCTITLE */ | ||
88 | |||
89 | extern char **environ; | ||
89 | 90 | ||
90 | /* | 91 | /* |
91 | * argv clobbering uses existing argv space, all other methods need a buffer | 92 | * argv clobbering uses existing argv space, all other methods need a buffer |
@@ -104,6 +105,7 @@ static char **save_argv; | |||
104 | 105 | ||
105 | extern char *__progname; | 106 | extern char *__progname; |
106 | 107 | ||
108 | #ifndef HAVE_SETPROCTITLE | ||
107 | /* | 109 | /* |
108 | * Call this to update the ps status display to a fixed prefix plus an | 110 | * Call this to update the ps status display to a fixed prefix plus an |
109 | * indication of what you're currently doing passed in the argument. | 111 | * indication of what you're currently doing passed in the argument. |