Bug 1031092 followup - Give up on moving jsproxy.h and jswrapper.h; fix bustage on a CLOSED TREE. (r=BurningManWasLastWeekRight?)

--HG--
rename : js/src/proxy/jsproxy.h => js/src/jsproxy.h
rename : js/src/proxy/jswrapper.h => js/src/jswrapper.h

js/src/jsproxy.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef proxy_jsproxy_h
-#define proxy_jsproxy_h
+#ifndef jsproxy_h
+#define jsproxy_h
 
 #include "mozilla/Maybe.h"
 

js/src/jswrapper.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef proxy_jswrapper_h
-#define proxy_jswrapper_h
+#ifndef jswrapper_h
+#define jswrapper_h
 
 #include "mozilla/Attributes.h"
 

js/src/moz.build

@@ -53,12 +53,12 @@ EXPORTS += [
     'jsfriendapi.h',
     'jsprf.h',
     'jsprototypes.h',
+    'jsproxy.h',
     'jspubtd.h',
     'jstypes.h',
     'jsversion.h',
+    'jswrapper.h',
     'perf/jsperf.h',
-    'proxy/jsproxy.h',
-    'proxy/jswrapper.h',
 ]
 
 # If you add a header here, add it to js/src/jsapi-tests/testIntTypesABI.cpp so

js/src/proxy/CrossCompartmentWrapper.cpp

@@ -4,9 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jswrapper.h"
-
 #include "jsiter.h"
+#include "jswrapper.h"
 
 #include "proxy/DeadObjectProxy.h"
 #include "vm/WrapperObject.h"

js/src/proxy/DeadObjectProxy.cpp

@@ -14,8 +14,6 @@
 using namespace js;
 using namespace js::gc;
 
-typedef JSPropertyDescriptor PropertyDescriptor;
-
 bool
 DeadObjectProxy::isExtensible(JSContext *cx, HandleObject proxy, bool *extensible) const
 {

js/src/proxy/Proxy.cpp

@@ -4,14 +4,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jsproxy.h"
-
 #include <string.h>
 
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsfun.h"
 #include "jsgc.h"
+#include "jsproxy.h"
 #include "jswrapper.h"
 
 #include "gc/Marking.h"

js/src/proxy/SecurityWrapper.cpp

@@ -4,9 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jswrapper.h"
-
 #include "jsapi.h"
+#include "jswrapper.h"
 
 #include "jsatominlines.h"
 

js/src/proxy/Wrapper.cpp

@@ -4,11 +4,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "jswrapper.h"
-
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jsexn.h"
+#include "jswrapper.h"
 
 #include "vm/ErrorObject.h"
 #include "vm/WrapperObject.h"