1 files changed, 19 insertions, 11 deletions

diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index c3a17ee..039d4b9 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)nonints.h	8.3 (Berkeley) 3/19/94
+ *	@(#)nonints.h	8.4 (Berkeley) 4/28/95
  */
 
 /* arch.c */
@@ -47,7 +47,8 @@ int Arch_MemMTime __P((GNode *));
 void Arch_FindLib __P((GNode *, Lst));
 Boolean Arch_LibOODate __P((GNode *));
 void Arch_Init __P((void));
-  
+void Arch_End __P((void));
+
 /* compat.c */
 void Compat_Run __P((Lst));
 
@@ -62,28 +63,32 @@ void For_Run  __P((void));
 /* main.c */
 void Main_ParseArgLine __P((char *));
 int main __P((int, char **));
-void Error __P((const char *, ...));
-void Fatal __P((const char *, ...));
-void Punt __P((const char *, ...));
+void Error __P((char *, ...));
+void Fatal __P((char *, ...));
+void Punt __P((char *, ...));
 void DieHorribly __P((void));
+int PrintAddr __P((ClientData, ClientData));
 void Finish __P((int));
-char *emalloc __P((u_int));
+char *emalloc __P((size_t));
 void enomem __P((void));
 
 /* parse.c */
-void Parse_Error __P((int, const char *, ...));
+void Parse_Error __P((int, char *, ...));
 Boolean Parse_AnyExport __P((void));
 Boolean Parse_IsVar __P((char *));
 void Parse_DoVar __P((char *, GNode *));
 void Parse_AddIncludeDir __P((char *));
 void Parse_File __P((char *, FILE *));
 void Parse_Init __P((void));
+void Parse_End __P((void));
 void Parse_FromString __P((char *));
 Lst Parse_MainName __P((void));
 
 /* str.c */
+void str_init __P((void));
+void str_end __P((void));
 char *str_concat __P((char *, char *, int));
-char **brk_string __P((char *, int *));
+char **brk_string __P((char *, int *, Boolean));
 char *Str_FindSubstring __P((char *, char *));
 int Str_Match __P((char *, char *));
 char *Str_SYSVMatch __P((char *, char *, int *len));
@@ -93,7 +98,7 @@ void Str_SYSVSubst __P((Buffer, char *, char *, int));
 void Suff_ClearSuffixes __P((void));
 Boolean Suff_IsTransform __P((char *));
 GNode *Suff_AddTransform __P((char *));
-int Suff_EndTransform __P((GNode *));
+int Suff_EndTransform __P((ClientData, ClientData));
 void Suff_AddSuffix __P((char *));
 Lst Suff_GetPath __P((char *));
 void Suff_DoPaths __P((void));
@@ -102,10 +107,12 @@ void Suff_AddLib __P((char *));
 void Suff_FindDeps __P((GNode *));
 void Suff_SetNull __P((char *));
 void Suff_Init __P((void));
+void Suff_End __P((void));
 void Suff_PrintAll __P((void));
 
 /* targ.c */
 void Targ_Init __P((void));
+void Targ_End __P((void));
 GNode *Targ_NewGN __P((char *));
 GNode *Targ_FindNode __P((char *, int));
 Lst Targ_FindList __P((Lst, int));
@@ -113,7 +120,7 @@ Boolean Targ_Ignore __P((GNode *));
 Boolean Targ_Silent __P((GNode *));
 Boolean Targ_Precious __P((GNode *));
 void Targ_SetMain __P((GNode *));
-int Targ_PrintCmd __P((char *));
+int Targ_PrintCmd __P((ClientData, ClientData));
 char *Targ_FmtTime __P((time_t));
 void Targ_PrintType __P((int));
 void Targ_PrintGraph __P((int));
@@ -123,10 +130,11 @@ void Var_Delete __P((char *, GNode *));
 void Var_Set __P((char *, char *, GNode *));
 void Var_Append __P((char *, char *, GNode *));
 Boolean Var_Exists __P((char *, GNode *));
-char *Var_Value __P((char *, GNode *));
+char *Var_Value __P((char *, GNode *, char **));
 char *Var_Parse __P((char *, GNode *, Boolean, int *, Boolean *));
 char *Var_Subst __P((char *, char *, GNode *, Boolean));
 char *Var_GetTail __P((char *));
 char *Var_GetHead __P((char *));
 void Var_Init __P((void));
+void Var_End __P((void));
 void Var_Dump __P((GNode *));