- (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before

   testing its value.

When HAVE_SETPROCTITLE is defined (at least on NetBSD, gcc 2.95.3) the test
"#if SPT_TYPE == SPT_REUSEARGV" is not true (probably because SPT_TYPE or
SPT_REUSEARGV is not defined).  This results in the following build error:

$ gcc [flags] setproctitle.c
setproctitle.c: In function `compat_init_setproctitle':
setproctitle.c:102: `argv_start' undeclared (first use in this function)

2 files changed, 4 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 078ff6e20..8b983b857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
      [reconfigure.sh]
      missing $SUDO; from dtucker@zip.com.au
  - (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS.
+ - (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before
+   testing its value.
 
 20030618
  - (djm) OpenBSD CVS Sync
@@ -567,4 +569,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2817 2003/06/22 02:33:27 dtucker Exp $
+$Id: ChangeLog,v 1.2818 2003/06/22 08:32:10 dtucker Exp $
diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c
index f05cb0e8c..b41100fc6 100644
--- a/openbsd-compat/setproctitle.c
+++ b/openbsd-compat/setproctitle.c
@@ -62,7 +62,7 @@ static size_t argv_env_len = 0;
 void
 compat_init_setproctitle(int argc, char *argv[])
 {
-#if SPT_TYPE == SPT_REUSEARGV
+#if defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV
         extern char **environ;
         char *lastargv = NULL;
         char **envp = environ;