declare merge() externally; ANSI C fix

SCCS-vsn: old/init/init.c 5.10
SCCS-vsn: sbin/init/init.c 5.10

diff --git a/usr/src/old/init/init.c b/usr/src/old/init/init.c
index 8765e27..9ee221b 100644 (file)
--- a/usr/src/old/init/init.c
+++ b/usr/src/old/init/init.c
@@ -247,6 +247,7 @@ runcom(oldhowto)
        return (1);
 }
 
        return (1);
 }
 

+int merge();

 struct sigvec  mvec = { merge, sigmask(SIGTERM), 0 };
 /*
  * Multi-user.  Listen for users leaving, SIGHUP's
 struct sigvec  mvec = { merge, sigmask(SIGTERM), 0 };
 /*
  * Multi-user.  Listen for users leaving, SIGHUP's

diff --git a/usr/src/sbin/init/init.c b/usr/src/sbin/init/init.c
index 8765e27..9ee221b 100644 (file)
--- a/usr/src/sbin/init/init.c
+++ b/usr/src/sbin/init/init.c
@@ -247,6 +247,7 @@ runcom(oldhowto)
        return (1);
 }
 
        return (1);
 }
 

+int merge();

 struct sigvec  mvec = { merge, sigmask(SIGTERM), 0 };
 /*
  * Multi-user.  Listen for users leaving, SIGHUP's
 struct sigvec  mvec = { merge, sigmask(SIGTERM), 0 };
 /*
  * Multi-user.  Listen for users leaving, SIGHUP's