remove acconfig.h

[openssh.git] / openbsd-compat / setproctitle.c

diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c
index 24cff0c80dcfdf692e7fde8678afb2b5d0743ac2..6e2b19bb4f584c50069196db7a6b4d0066b5d4ca 100644 (file)
--- a/openbsd-compat/setproctitle.c
+++ b/openbsd-compat/setproctitle.c
@@ -14,11 +14,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -45,8 +41,8 @@
 #endif
 
 #define SPT_NONE       0       /* don't use it at all */
-#define SPT_PSTAT      1       /* cover argv with title information */
-#define SPT_REUSEARGV  2       /* use pstat(PSTAT_SETCMD, ...) */
+#define SPT_PSTAT      1       /* use pstat(PSTAT_SETCMD, ...) */
+#define SPT_REUSEARGV  2       /* cover argv with title information */
 
 #ifndef SPT_TYPE
 # define SPT_TYPE      SPT_NONE
@@ -66,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;