move _PATH_MAILDIR into <paths.h>

SCCS-vsn: libexec/mail.local/pathnames.h 5.2
SCCS-vsn: libexec/comsat/comsat.c 5.21

diff --git a/usr/src/libexec/comsat/comsat.c b/usr/src/libexec/comsat/comsat.c
index 554e894..c234eec 100644 (file)
--- a/usr/src/libexec/comsat/comsat.c
+++ b/usr/src/libexec/comsat/comsat.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)comsat.c   5.20 (Berkeley) %G%";
+static char sccsid[] = "@(#)comsat.c   5.21 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -30,14 +30,10 @@ static char sccsid[] = "@(#)comsat.c        5.20 (Berkeley) %G%";
 #include <errno.h>
 #include <netdb.h>
 #include <syslog.h>
 #include <errno.h>
 #include <netdb.h>
 #include <syslog.h>

-#include <string.h>

 #include <ctype.h>
 #include <ctype.h>

+#include <string.h>
+#include <paths.h>

 
 

-#include "pathnames.h"
-
-/*
- * comsat
- */

 int    debug = 0;
 #define        dsyslog if (debug) syslog
 
 int    debug = 0;
 #define        dsyslog if (debug) syslog
 

diff --git a/usr/src/libexec/mail.local/pathnames.h b/usr/src/libexec/mail.local/pathnames.h
index 7b4e04a..d504a38 100644 (file)
--- a/usr/src/libexec/mail.local/pathnames.h
+++ b/usr/src/libexec/mail.local/pathnames.h
@@ -4,11 +4,10 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)pathnames.h 5.1 (Berkeley) %G%
+ *     @(#)pathnames.h 5.2 (Berkeley) %G%

  */
 
 #include <paths.h>
 
 #undef _PATH_TMP
 #define _PATH_TMP      "/tmp/maXXXXX"
  */
 
 #include <paths.h>
 
 #undef _PATH_TMP
 #define _PATH_TMP      "/tmp/maXXXXX"

-#define _PATH_MAILDIR  "/var/mail/"