1350998 - windows.h macros are interfering with spidermonkey code

Status: RESOLVED FIXED

(Core :: JavaScript Engine, enhancement)

Description

[Steve Fink [:sfink] [:s:]]

We have an include file named jswin.h that should normally used in place of windows.h.

Comment 1

[Steve Fink [:sfink] [:s:]]

Attachment: always include windows.h via jswin.h to undo macro damage

I haven't tried pushing this to try yet, and I don't know if vtune stuff needs any of those macros.

https://treeherder.mozilla.org/#/jobs?repo=try&revision=67115abfb373292d59ab821334c2864b21c6c098

Comment 2

[Sean Stangl [:sstangl]]

Comment on attachment 8851693 [details] [diff] [review]
always include windows.h via jswin.h to undo macro damage

Review of attachment 8851693 [details] [diff] [review]:
-----------------------------------------------------------------

::: js/src/vm/Runtime.cpp
@@ -15,5 @@
>  #include <mach/mach.h>
>  #elif defined(XP_UNIX)
>  #include <sys/resource.h>
> -#elif defined(XP_WIN)
> -#include <windows.h>

Doesn't this still need a "jswin.h" include? It looks like it was deleted.

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/5e934196e757
always include windows.h via jswin.h to undo macro damage, r=sstangl

Comment 4

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/5e934196e757

Comment 5

[Steve Fink [:sfink] [:s:]]

Sorry, didn't reply to this.

(In reply to Sean Stangl [:sstangl] from comment #2)
> ::: js/src/vm/Runtime.cpp
> @@ -15,5 @@
> >  #include <mach/mach.h>
> >  #elif defined(XP_UNIX)
> >  #include <sys/resource.h>
> > -#elif defined(XP_WIN)
> > -#include <windows.h>
> 
> Doesn't this still need a "jswin.h" include? It looks like it was deleted.

Several lines later, it includes jswin.h. So it was double-including, but you can't see it in the patch because of our enforced include ordering rules.