Module Name: src
Committed By: sjg
Date: Mon Sep 13 20:34:21 UTC 2010
Modified Files:
src/usr.bin/make: meta.c
Log Message:
We do not need filemon(9) to have a .meta file
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/meta.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.1 src/usr.bin/make/meta.c:1.2
--- src/usr.bin/make/meta.c:1.1 Mon Sep 13 15:36:57 2010
+++ src/usr.bin/make/meta.c Mon Sep 13 20:34:21 2010
@@ -37,7 +37,9 @@
#include <fcntl.h>
#include <libgen.h>
#include <errno.h>
+#if !defined(HAVE_CONFIG_H) || defined(HAVE_ERR_H)
#include <err.h>
+#endif
#include "make.h"
#include "job.h"
@@ -70,6 +72,10 @@
# define ROUNDUP(n, u) (N2U((n), (u)) * (u))
#endif
+#if !defined(HAVE_STRSEP)
+# define strsep(s, d) stresep((s), (d), 0)
+#endif
+
/*
* Filemon is a kernel module which snoops certain syscalls.
*
@@ -567,11 +573,9 @@
}
getcwd(cwd, sizeof(cwd));
Var_Set(".ERROR_CWD", cwd, VAR_GLOBAL, 0);
-#ifdef USE_FILEMON
if (pbm) {
Var_Set(".ERROR_META_FILE", pbm->meta_fname, VAR_GLOBAL, 0);
}
-#endif
}
void
