518741 - js-ctypes cannot build on Windows x64

Status: RESOLVED FIXED

(Core :: js-ctypes, defect)

Description

[Makoto Kato [:m_kato]]

Attachment: patch v1

FFI_STDCALL isn't defined on Windows x64.  So js-ctypes cannot build on Windows x64.

Comment 1

[[e-mail]]

Comment on attachment 402735 [details] [diff] [review]
patch v1

>+#if defined(XP_WIN32) && !defined(_WIN64)

Ugh, XP_WIN32 is defined for win64?

Anyway, let's just do #if defined(_WIN32), since that's what we really want. r=me with that.

Does ctypes build and pass tests for you? I haven't built on win64 so I'm curious.

Thanks for the patch!

Comment 2

[[e-mail]]

Landed on trunk as http://hg.mozilla.org/mozilla-central/rev/6c221a030a78, with the _WIN32 change. (I'll land this fix on branch, too, when I land ctypes there.)

Comment 3

[Makoto Kato [:m_kato]]

(In reply to comment #1)
> (From update of attachment 402735 [details] [diff] [review])
> >+#if defined(XP_WIN32) && !defined(_WIN64)
> 
> Ugh, XP_WIN32 is defined for win64?

Yes.  buildconfig patch is bug 469654. (I have to get approve comm-central's patch to land this buuilgconfig patch for m-c, so I don't land it yet)

If I should add XP_WIN64 macro, I will discuss with Ted.  We have to replace most XP_WIN32 with XP_WIN.

> Does ctypes build and pass tests for you? I haven't built on win64 so I'm
> curious.

Build test is done.  I will create test code for Windows x64.

Comment 4

[[e-mail]]

You can do |make xpcshell-test| in $OBJDIR/js/ctypes/tests; let me know if that works or not.

Comment 5

[[e-mail]]

Landed on 1.9.2 per bug 513783.

Comment 6

[[e-mail]]

(In reply to comment #4)
> You can do |make xpcshell-test|

Er, |make xpcshell-tests|, that is.

Comment 7

[Makoto Kato [:m_kato]]

I reopen this bug.  Because your check in causes build error on Win x64.

Dan, why do you change to _WIN32 instead of my patch??  _WIN32 means both Win32 and Win64 target.

In reference of http://msdn.microsoft.com/ja-jp/library/b0084kay.aspx,

_WIN32  Defined for applications for Win32 and Win64. Always defined.

Comment 8

[Makoto Kato [:m_kato]]

Attachment: patch v2

_WIN32 means both Win32 and Win64.  So we need additional condition for Win64.

Comment 9

[[e-mail]]

Comment on attachment 403712 [details] [diff] [review]
patch v2

Thanks. I assumed they were mutually exclusive, which obviously they're not!

Does jsctypes pass unit tests (comment 4) with this patch? Let's not land it til we know everything's working.

Comment 10

[Makoto Kato [:m_kato]]

(In reply to comment #9)
> (From update of attachment 403712 [details] [diff] [review])
> Thanks. I assumed they were mutually exclusive, which obviously they're not!
> 
> Does jsctypes pass unit tests (comment 4) with this patch? Let's not land it
> til we know everything's working.

test is passed.

$ make -C js/ctypes/tests/ xpcshell-tests
make: Entering directory `/c/Workspace/mozilla-hg/objdir-win64/js/ctypes/tests'
c:/mozilla-build/python25/python.exe -u /c/Workspace/mozilla-hg/mozilla-win64/config/pythonpath.py \
          -I/c/Workspace/mozilla-hg/mozilla-win64/build \
          /c/Workspace/mozilla-hg/mozilla-win64/testing/xpcshell/runxpcshelltests.py \
          --symbols-path=../../../dist/crashreporter-symbols \
          ../../../dist/bin/xpcshell \
          ../../../_tests/xpcshell/jsctypes-test/unit
TEST-PASS | c:\Workspace\mozilla-hg\objdir-win64\_tests\xpcshell\jsctypes-test\unit\test_jsctypes.js | test pa
ssed
INFO | Result summary:
INFO | Passed: 1
INFO | Failed: 0
make: Leaving directory `/c/Workspace/mozilla-hg/objdir-win64/js/ctypes/tests'

Comment 11

[[e-mail]]

http://hg.mozilla.org/mozilla-central/rev/4fae2bb3a717

Thanks for the (second!) fix.

Comment 12

[[e-mail]]

http://hg.mozilla.org/releases/mozilla-1.9.2/rev/59a67f247330