- (djm) Fix compilation for NetBSD from dtucker@zip.com.au

This commit is contained in:
Damien Miller 2003-01-20 13:15:10 +11:00
parent e443e9398e
commit 140344b809
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,6 @@
20030120
- (djm) Fix compilation for NetBSD from dtucker@zip.com.au
20030118 20030118
- (djm) Revert fix for Bug #442 for now. - (djm) Revert fix for Bug #442 for now.
@ -1034,4 +1037,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2575 2003/01/18 05:24:06 djm Exp $ $Id: ChangeLog,v 1.2576 2003/01/20 02:15:10 djm Exp $

View File

@ -31,7 +31,7 @@
* to contain some useful information. Mechanism differs wildly across * to contain some useful information. Mechanism differs wildly across
* platforms. * 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 * Copyright 2000 by PostgreSQL Global Development Group
* various details abducted from various places * various details abducted from various places
@ -51,8 +51,6 @@
#include <sys/exec.h> #include <sys/exec.h>
#endif #endif
extern char **environ;
/*------ /*------
* Alternative ways of updating ps display: * Alternative ways of updating ps display:
* *
@ -86,6 +84,9 @@ extern char **environ;
#ifndef SETPROCTITLE_PS_PADDING #ifndef SETPROCTITLE_PS_PADDING
# define SETPROCTITLE_PS_PADDING ' ' # define SETPROCTITLE_PS_PADDING ' '
#endif #endif
#endif /* HAVE_SETPROCTITLE */
extern char **environ;
/* /*
* argv clobbering uses existing argv space, all other methods need a buffer * argv clobbering uses existing argv space, all other methods need a buffer
@ -104,6 +105,7 @@ static char **save_argv;
extern char *__progname; extern char *__progname;
#ifndef HAVE_SETPROCTITLE
/* /*
* Call this to update the ps status display to a fixed prefix plus an * 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. * indication of what you're currently doing passed in the argument.