624442 - vprof ifndef-guard MIN/MAX

Status: RESOLVED FIXED

(Tamarin Graveyard :: Tools, defect)

Description

[Felix S. Klock II [:pnkfelix, :fklock]]

vprof.cpp has macro definitions for MIN/MAX that do what you think.

But on my system, if you #include sysctl, it pulls in its own (compatible) definitions for MIN/MAX.  Not a problem, but you do get warnings from gcc.

To avoid the warnings, I'm adding #ifndef guards; there are already a bunch of similar guards strewn throughout the file.

Comment 1

[Tamarin Bot]

changeset: 5754:c876056685b8
user:      Felix S Klock II <[e-mail]>
summary:   Bug 624442: ifndef-guard MIN/MAX macro definitions in vprof.cpp (r=fklockii)

http://hg.mozilla.org/tamarin-redux/rev/c876056685b8

Comment 2

[Felix S. Klock II [:pnkfelix, :fklock]]

(In reply to comment #0)
> But on my system, if you #include sysctl, it pulls in its own (compatible)
> definitions for MIN/MAX.  Not a problem, but you do get warnings from gcc.

Note that the aforementioned #include <sys/sysctl.h> is added in the patch for Bug 611232

Comment 3

[Edwin Smith]

Reopening only to track the change through nanojit-central back into TR/TM.

NJ: http://hg.mozilla.org/projects/nanojit-central/rev/17d3562dd533

Comment 4

[Tamarin Bot]

changeset: 6024:3561f821fde3
user:      Edwin Smith <[e-mail]>
summary:   Bug 624442: ifndef-guard MIN/MAX macro definitions in vprof.cpp (r=fklockii)

http://hg.mozilla.org/tamarin-redux/rev/3561f821fde3

Comment 5

[Nicholas Nethercote [inactive]]

http://hg.mozilla.org/tracemonkey/rev/b9c97e99db42

Is Tamarin-bot going to keep closing these bugs as soon as it's merged them to TR?  That'll be annoying if so.

Comment 6

[Brent Baker]

The tamarin-bot does not modify any status of the bug, all that it is doing is commenting to the bug that a submission was made to the tamarin-redux repo with this bug number referenced.

Comment 7

[Edwin Smith]

In the case of this bug, Felix closed it after fixing in TR; Felix wasn't aware vprof came from nanojit-central.  Many weeks later, I did an import from NC to TR, clobbering the changes.  I made the fix in NC then reopened this bug for tracking.  

Then I forgot to mark it fixed-in-tamarin after re-importing NC to TR... Just did it.

We still manually merge NC->TR, although Rick is working on some automation that automatically picks up NC changes, imports to TR, then sandbox-tests, to take grunt work out of the picture.  Details available if interested.

Comment 8

[Dan Smith]

Marking resolved/closed as it is fixed in TM, NJ and TR