зеркало из https://github.com/mozilla/gecko-dev.git
Fix up a little merge fail so that infallible malloc macros don't get run on js/src files.
This commit is contained in:
Родитель
762c04cd61
Коммит
e0f914f567
|
@ -37,6 +37,13 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
// JavaScript includes
|
||||
#include "jsapi.h"
|
||||
#include "jsprvtd.h" // we are using private JS typedefs...
|
||||
#include "jscntxt.h"
|
||||
#include "jsobj.h"
|
||||
#include "jsdbgapi.h"
|
||||
|
||||
#include "nscore.h"
|
||||
#include "nsDOMClassInfo.h"
|
||||
#include "nsCRT.h"
|
||||
|
@ -62,13 +69,6 @@
|
|||
#include "nsIRunnable.h"
|
||||
#include "nsThreadUtils.h"
|
||||
|
||||
// JavaScript includes
|
||||
#include "jsapi.h"
|
||||
#include "jsprvtd.h" // we are using private JS typedefs...
|
||||
#include "jscntxt.h"
|
||||
#include "jsobj.h"
|
||||
#include "jsdbgapi.h"
|
||||
|
||||
// General helper includes
|
||||
#include "nsGlobalWindow.h"
|
||||
#include "nsIContent.h"
|
||||
|
|
Загрузка…
Ссылка в новой задаче