b2g build broken since Bug 716544 landed

RESOLVED FIXED

Status

defect
RESOLVED FIXED
8 years ago
8 years ago

People

(Reporter: fabrice, Assigned: fabrice)

Tracking

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

Posted patch patchSplinter Review
building fails with:

nsChromeRegistryContent.cpp
In file included from /home/fabrice/dev/b2g/inbound/ipc/chromium/src/base/scoped_ptr.h:43,
                 from /home/fabrice/dev/b2g/inbound/ipc/chromium/src/base/message_loop.h:18,
                 from ../../dist/include/mozilla/ipc/AsyncChannel.h:44,
                 from ../../dist/include/mozilla/ipc/SyncChannel.h:43,
                 from ../../dist/include/mozilla/ipc/RPCChannel.h:53,
                 from ../../ipc/ipdl/_ipdlheaders/mozilla/dom/PContentParent.h:76,
                 from /home/fabrice/dev/b2g/inbound/chrome/src/nsChromeRegistryChrome.cpp:39:
/home/fabrice/dev/b2g/toro/B2G/glue/gonk/ndk/sources/cxx-stl/stlport/stlport/assert.h:35:6: error: #error assert has been defined before inclusion of assert.h header.

This patch reverts the gonk-specific part of bug 716544.
Attachment #601040 - Flags: review?(khuey)
OS: Linux → Gonk
Hardware: x86_64 → All
I think you should try to see why you have assert defined twice before reverting this.
https://hg.mozilla.org/mozilla-central/rev/75f1c3c4d889
Status: NEW → RESOLVED
Closed: 8 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.