svn commit: r237068 - projects/calloutng/lib/libprocstat
Davide Italiano
davide at FreeBSD.org
Thu Jun 14 14:01:54 UTC 2012
Author: davide
Date: Thu Jun 14 14:01:54 2012
New Revision: 237068
URL: http://svn.freebsd.org/changeset/base/237068
Log:
Fix (or at least, workaround) an include conflict in libprocstat which
causes buildworld to fail, after my recent changes to sys/sys/_callout.h
header.
Reviewed by: stas
Modified:
projects/calloutng/lib/libprocstat/zfs.c
Modified: projects/calloutng/lib/libprocstat/zfs.c
==============================================================================
--- projects/calloutng/lib/libprocstat/zfs.c Thu Jun 14 13:55:52 2012 (r237067)
+++ projects/calloutng/lib/libprocstat/zfs.c Thu Jun 14 14:01:54 2012 (r237068)
@@ -35,6 +35,7 @@
#undef lbolt
#undef lbolt64
+#undef gethrestime
#undef gethrestime_sec
#include <sys/zfs_context.h>
#include <sys/spa.h>
More information about the svn-src-projects
mailing list