779372 - Compile error on Windows js shells involving zlib

Status: VERIFIED FIXED

(Core :: JavaScript Engine, defect)

Description

[Gary Kwong [:gkw] [:nth10sd] (NOT official MoCo now)]

Attachment: stdout

There is a compile error on Windows js shells involving zlib, see attached log.

Comment 1

[Gary Kwong [:gkw] [:nth10sd] (NOT official MoCo now)]

This suggested patch by Benjamin over IRC does not work:

diff -r 162b401d8774 js/src/jsutil.h
--- a/js/src/jsutil.h   Tue Jul 31 17:35:46 2012 -0700
+++ b/js/src/jsutil.h   Tue Jul 31 17:43:50 2012 -0700
@@ -10,17 +10,19 @@
 
 #ifndef jsutil_h___
 #define jsutil_h___
 
 #include "mozilla/Attributes.h"
 
 #include "js/Utility.h"
 
+#ifdef USE_ZLIB
 #include "zlib.h"
+#endif
 
 /* Forward declarations. */
 struct JSContext;
 
 static JS_ALWAYS_INLINE void *
 js_memcpy(void *dst_, const void *src_, size_t len)
 {
     char *dst = (char *) dst_;

Comment 2

[Gary Kwong [:gkw] [:nth10sd] (NOT official MoCo now)]

I was using pymake on mozilla-central changeset 02346e2e7156.

Comment 3

[Gary Kwong [:gkw] [:nth10sd] (NOT official MoCo now)]

I used (with MozillaBuild and Visual Studio 2010):

--disable-optimize --enable-debug --enable-methodjit --enable-type-inference --enable-more-deterministic --disable-tests

The patch in bug 779393 does not fix this.

Comment 4

[Gary Kwong [:gkw] [:nth10sd] (NOT official MoCo now)]

(In reply to Gary Kwong [:gkw, :nth10sd] from comment #1)
> This suggested patch by Benjamin over IRC does not work:

On further checking, the patch in comment 1 (in conjunction with the patch in bug 779393) does make it work. Something else in my harness is making it fail but that's out of the scope of this bug.

Comment 5

[:Benjamin Peterson]

Attachment: add missing #ifdef

Comment 6

[Gary Kwong [:gkw] [:nth10sd] (NOT official MoCo now)]

This should land as soon as possible once mozilla-inbound is reopened.

Comment 7

[:Benjamin Peterson]

https://hg.mozilla.org/integration/mozilla-inbound/rev/ac7b1d3e3d83

Comment 8

[Gary Kwong [:gkw] [:nth10sd] (NOT official MoCo now)]

in-testsuite- because this fixes a compile error.

Comment 9

[Gary Kwong [:gkw] [:nth10sd] (NOT official MoCo now)]

This was likely caused by bug 777190.

Comment 10

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/ac7b1d3e3d83