Update to makedepend 1.0.4. Tested by naddy@ on a bulk ports build

1 files changed, 33 insertions, 16 deletions

diff --git a/util/makedepend/def.h b/util/makedepend/def.h
index fba0a0a27..3f55a52cd 100644
--- a/util/makedepend/def.h
+++ b/util/makedepend/def.h
@@ -40,7 +40,7 @@ in this Software without prior written authorization from The Open Group.
 #include <sys/stat.h>
 
 #define MAXDEFINES	512
-#define MAXFILES	1024
+#define MAXFILES	2048
 #define MAXINCFILES	128	/* "-include" files */
 #define MAXDIRS		64
 #define SYMTABINC	10	/* must be > 1 for define() to work right */
@@ -76,7 +76,7 @@ in this Software without prior written authorization from The Open Group.
 extern int	_debugmask;
 /*
  * debug levels are:
- * 
+ *
  *     0	show ifn*(def)*,endif
  *     1	trace defined/!defined
  *     2	show #include
@@ -130,17 +130,16 @@ struct filepointer {
 
 #include <stdlib.h>
 
-#define copy(s)		strdup(s)
 int                     match(const char *str, const char * const *list);
 char			*base_name(const char *file);
 char			*getnextline(struct filepointer *fp);
-struct symtab		**slookup(char *symbol, struct inclist *file);
-struct symtab		**isdefined(char *symbol, struct inclist *file,
+struct symtab		**slookup(const char *symbol, struct inclist *file);
+struct symtab		**isdefined(const char *symbol, struct inclist *file,
 				    struct inclist **srcfile);
-struct symtab		**fdefined(char *symbol, struct inclist *file,
+struct symtab		**fdefined(const char *symbol, struct inclist *file,
 				   struct inclist **srcfile);
 struct filepointer	*getfile(const char *file);
-void                    included_by(struct inclist *ip, 
+void                    included_by(struct inclist *ip,
 				    struct inclist *newfile);
 struct inclist		*newinclude(const char *newfile,
 				    const char *incstring);
@@ -150,20 +149,21 @@ struct inclist		*inc_path(const char *file, const char *include,
 
 void                    freefile(struct filepointer *fp);
 
-void                    define2(char *name, char *val, struct inclist *file);
+void                    define2(const char *name, const char *val,
+				struct inclist *file);
 void                    define(char *def, struct inclist *file);
-void                    undefine(char *symbol, struct inclist *file);
-int                     find_includes(struct filepointer *filep, 
-				      struct inclist *file, 
-				      struct inclist *file_red, 
+void                    undefine(const char *symbol, struct inclist *file);
+int                     find_includes(struct filepointer *filep,
+				      struct inclist *file,
+				      struct inclist *file_red,
 				      int recursion, boolean failOK);
 
-void                    recursive_pr_include(struct inclist *head, 
+void                    recursive_pr_include(struct inclist *head,
 					     const char *file,
 					     const char *base);
-void                    add_include(struct filepointer *filep, 
-				    struct inclist *file, 
-				    struct inclist *file_red, 
+void                    add_include(struct filepointer *filep,
+				    struct inclist *file,
+				    struct inclist *file_red,
 				    const char *include, int type,
 				    boolean failOK);
 
@@ -176,3 +176,20 @@ int                     cppsetup(const char *filename,
 extern void fatalerr(const char *, ...) _X_ATTRIBUTE_PRINTF(1, 2);
 extern void warning(const char *, ...) _X_ATTRIBUTE_PRINTF(1, 2);
 extern void warning1(const char *, ...) _X_ATTRIBUTE_PRINTF(1, 2);
+
+extern struct inclist	  inclist[ MAXFILES ];
+extern struct inclist    *inclistp;
+extern struct inclist    *inclistnext;
+extern struct inclist     maininclist;
+extern const char        *includedirs[ ];
+extern const char       **includedirsnext;
+extern const char * const directives[];
+extern char              *notdotdot[ ];
+
+extern const char        *objprefix;
+extern const char        *objsuffix;
+extern int          	  width;
+extern boolean            printed;
+extern boolean            verbose;
+extern boolean            show_where_not;
+extern boolean            warn_multiple;