[Ganglia-svn] SF.net SVN: ganglia:[2124] trunk/monitor-core/libmetrics/dragonfly/metrics. c

[<ca...@us...>]

Revision: 2124
          http://ganglia.svn.sourceforge.net/ganglia/?rev=2124&view=rev
Author:   carenas
Date:     2009-11-30 05:35:27 +0000 (Mon, 30 Nov 2009)

Log Message:
-----------
libmetrics: dragonflybsd: workaround collision with struct pmap (BUG245)

Modified Paths:
--------------
    trunk/monitor-core/libmetrics/dragonfly/metrics.c

Modified: trunk/monitor-core/libmetrics/dragonfly/metrics.c
===================================================================
--- trunk/monitor-core/libmetrics/dragonfly/metrics.c	2009-11-29 23:26:23 UTC (rev 2123)
+++ trunk/monitor-core/libmetrics/dragonfly/metrics.c	2009-11-30 05:35:27 UTC (rev 2124)
@@ -5,6 +5,9 @@
  *  All bugs added by Carlo Marcelo Arenas Belon <ca...@sa...>
  *
  *  Tested on DragonFlyBSD 1.10.1 (i386)
+ *  Tested on DragonFlyBSD 1.12.0 (i386)
+ *  Tested on DragonFlyBSD 2.0.1 (i386)
+ *  Tested on DragonFlyBSD 2.4.1 (i386, amd64)
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -16,6 +19,12 @@
 #include <sys/mount.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
+/*
+ * XXX: HACK HACK HACK - avoid including machine/pmap.h and things that
+ * depend on it to avoid collision with struct pmap in rpc/pmap_prot.h
+ */
+#define _MACHINE_PMAP_H_
+#define _VM_VM_MAP_H_
 #include <sys/user.h>
 #include <kinfo.h>
 #include <sys/stat.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.