On Fri, Jun 20, 2008 at 10:44:05AM -0600, Brad Nicholes wrote: > >>> On 6/20/2008 at 4:20 AM, in message <[EMAIL PROTECTED]>, Carlo > Marcelo Arenas Belon <[EMAIL PROTECTED]> wrote: > > Mainly a problem with recent versions of OpenSolaris that provide apache 2.2 > > through SUNW provided packages like : > > > > * Solaris Express Developer Edition > > * OpenSolaris 2008.05 (AKA Indiana) > > * Solaris Express Nevada > > > > Not exclusive of Solaris, as the conflict will be triggered also in other > > platforms that will have a header named "scoreboard.h" added to the include > > path before the internal headers from ganglia are added. > > > > This time, attaching patch for real > > > > Carlo > > This patch removes all of the code from scoreboard.h but doesn't add back > gm_scoreboard.h.
that is a deficiency from subversion (svn diff will not include the added files even if they are tagged as such by svn status after an svn move) $ svn status M gmond/gmond.c M gmond/modules/status/mod_gstatus.c A + lib/gm_scoreboard.h M lib/scoreboard.c M lib/Makefile.am D lib/scoreboard.h > As it stands, the patch doesn't apply cleanly to the 3.1 branch. the patch was only added so that it can be discussed easily, as instructed in the original report if you have access to a working svn tree it will much easier just to merge it from trunk (where trunk is whenever is your trunk svn tree): svn merge -c1416 trunk > Reverting scoreboard.h and then renaming it to gm_scoreboard.h works however. > Other than that, it all looks good. Committed revision 1437 Carlo ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php _______________________________________________ Ganglia-developers mailing list Ganglia-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ganglia-developers
