зеркало из https://github.com/mozilla/gecko-dev.git
try to fix moz_free macro substitution bustage on Windows by reordering includes
This commit is contained in:
Родитель
9b4b59c837
Коммит
0db3aeb569
|
@ -41,13 +41,13 @@
|
|||
#ifndef mozilla_jetpack_HandleParent_h
|
||||
#define mozilla_jetpack_HandleParent_h
|
||||
|
||||
#include "mozilla/jetpack/PHandleParent.h"
|
||||
#include "mozilla/jetpack/PHandleChild.h"
|
||||
|
||||
#include "jsapi.h"
|
||||
#include "jsobj.h"
|
||||
#include "jscntxt.h"
|
||||
|
||||
#include "mozilla/jetpack/PHandleParent.h"
|
||||
#include "mozilla/jetpack/PHandleChild.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace jetpack {
|
||||
|
||||
|
|
|
@ -36,8 +36,12 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "base/basictypes.h"
|
||||
#include "jscntxt.h"
|
||||
#include "jsapi.h"
|
||||
#include "jstl.h"
|
||||
#include "jshashtable.h"
|
||||
|
||||
#include "base/basictypes.h"
|
||||
|
||||
#include "mozilla/jetpack/JetpackActorCommon.h"
|
||||
#include "mozilla/jetpack/PJetpack.h"
|
||||
|
@ -45,10 +49,6 @@
|
|||
#include "mozilla/jetpack/PHandleChild.h"
|
||||
#include "mozilla/jetpack/Handle.h"
|
||||
|
||||
#include "jsapi.h"
|
||||
#include "jstl.h"
|
||||
#include "jshashtable.h"
|
||||
|
||||
using mozilla::jetpack::JetpackActorCommon;
|
||||
using mozilla::jetpack::PHandleParent;
|
||||
using mozilla::jetpack::HandleParent;
|
||||
|
|
|
@ -35,14 +35,14 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "base/basictypes.h"
|
||||
#include "jscntxt.h"
|
||||
#include "jsarray.h"
|
||||
|
||||
#include "base/basictypes.h"
|
||||
|
||||
#include "mozilla/jetpack/JetpackChild.h"
|
||||
#include "mozilla/jetpack/Handle.h"
|
||||
|
||||
#include "jsarray.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace jetpack {
|
||||
|
||||
|
|
|
@ -694,7 +694,7 @@ pref("network.http.redirection-limit", 20);
|
|||
|
||||
// Enable http compression: comment this out in case of problems with 1.1
|
||||
// NOTE: support for "compress" has been disabled per bug 196406.
|
||||
pref("network.http.accept-encoding" ,"gzip,deflate");
|
||||
pref("network.http.accept-encoding" ,"gzip, deflate");
|
||||
|
||||
pref("network.http.pipelining" , false);
|
||||
pref("network.http.pipelining.ssl" , false); // disable pipelining over SSL
|
||||
|
|
Загрузка…
Ссылка в новой задаче