move compatibility hooks for S_ISREG et al to conf.h

SCCS-vsn: usr.sbin/sendmail/src/readcf.c 6.30
SCCS-vsn: usr.sbin/sendmail/src/conf.h 6.24

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index 35b09ff..94c9ac8 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.h
+++ b/usr/src/usr.sbin/sendmail/src/conf.h
@@ -5,7 +5,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)conf.h      6.23 (Berkeley) %G%
+ *     @(#)conf.h      6.24 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -117,6 +117,17 @@
 **  example, it includes some POSIX compatibility definitions
 */
 
 **  example, it includes some POSIX compatibility definitions
 */
 

+/* System 5 compatibility */
+#ifndef S_ISREG
+#define S_ISREG(foo)   ((foo & S_IFREG) == S_IFREG)
+#endif
+#ifndef S_IWGRP
+#define S_IWGRP                020
+#endif
+#ifndef S_IWOTH
+#define S_IWOTH                002
+#endif
+

 /*
 **  Older systems don't have this error code -- it should be in
 **  /usr/include/sysexits.h.
 /*
 **  Older systems don't have this error code -- it should be in
 **  /usr/include/sysexits.h.

diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index 87b3fca..48067ea 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/readcf.c
+++ b/usr/src/usr.sbin/sendmail/src/readcf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)readcf.c   6.29 (Berkeley) %G%";
+static char sccsid[] = "@(#)readcf.c   6.30 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -17,17 +17,6 @@ static char sccsid[] = "@(#)readcf.c 6.29 (Berkeley) %G%";
 # include <resolv.h>
 #endif
 
 # include <resolv.h>
 #endif
 

-/* System 5 compatibility */
-#ifndef S_ISREG
-#define S_ISREG(foo)   ((foo & S_IFREG) == S_IFREG)
-#endif
-#ifndef S_IWGRP
-#define S_IWGRP                020
-#endif
-#ifndef S_IWOTH
-#define S_IWOTH                002
-#endif
-

 /*
 **  READCF -- read control file.
 **
 /*
 **  READCF -- read control file.
 **