Bug 924622 - Change the #include order of ImageBridge headers in nsXPCOMInit.cpp to avoid macro name collision on some platforms.

This commit is contained in:
Nicolas Silva 2014-04-30 17:43:09 +02:00
parent d43556c1c4
commit 4f253d0ace

View File

@ -16,6 +16,9 @@
#include "prlink.h"
#include "mozilla/layers/ImageBridgeChild.h"
#include "mozilla/layers/CompositorParent.h"
#include "nsCycleCollector.h"
#include "nsObserverList.h"
#include "nsObserverService.h"
@ -126,9 +129,6 @@ extern nsresult nsStringInputStreamConstructor(nsISupports *, REFNSIID, void **)
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/SystemMemoryReporter.h"
#include "mozilla/layers/ImageBridgeChild.h"
#include "mozilla/layers/CompositorParent.h"
#ifdef MOZ_VISUAL_EVENT_TRACER
#include "mozilla/VisualEventTracer.h"
#endif