Bug 677079 - Part e: Move js_GetSCOffset to jsfriendapi.h; r=luke
authorMs2ger <ms2ger@gmail.com>
Sun, 15 Jan 2012 09:13:08 +0100
changeset 85682 10519108297f9e61058a85623e085a3cda243b8a
parent 85681 ebd92ba20fd1379cbd7a6a155dca371daf56cdf5
child 85683 6ffce4fb752ba5b7ae02a844415aa0ced8607462
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs677079
milestone12.0a1
Bug 677079 - Part e: Move js_GetSCOffset to jsfriendapi.h; r=luke
dom/indexedDB/IDBObjectStore.cpp
js/src/jsclone.h
js/src/jsfriendapi.h
--- a/dom/indexedDB/IDBObjectStore.cpp
+++ b/dom/indexedDB/IDBObjectStore.cpp
@@ -36,17 +36,18 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "IDBObjectStore.h"
 
 #include "nsIJSContextStack.h"
 
-#include "jsclone.h"
+#include "jscntxt.h" // structuredCloneCallbacks
+#include "jsfriendapi.h"
 #include "mozilla/dom/StructuredCloneTags.h"
 #include "mozilla/storage.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "nsContentUtils.h"
 #include "nsDOMClassInfo.h"
 #include "nsDOMFile.h"
 #include "nsDOMLists.h"
 #include "nsEventDispatcher.h"
--- a/js/src/jsclone.h
+++ b/js/src/jsclone.h
@@ -41,19 +41,16 @@
 
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsstdint.h"
 
 #include "js/HashTable.h"
 #include "js/Vector.h"
 
-JS_FRIEND_API(uint64_t)
-js_GetSCOffset(JSStructuredCloneWriter* writer);
-
 namespace js {
 
 bool
 WriteStructuredClone(JSContext *cx, const Value &v, uint64_t **bufp, size_t *nbytesp,
                      const JSStructuredCloneCallbacks *cb, void *cbClosure);
 
 bool
 ReadStructuredClone(JSContext *cx, const uint64_t *data, size_t nbytes, Value *vp,
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -522,9 +522,14 @@ typedef enum JSErrNum {
 #include "js.msg"
 #undef MSG_DEF
     JSErr_Limit
 } JSErrNum;
 
 extern JS_FRIEND_API(const JSErrorFormatString *)
 js_GetErrorMessage(void *userRef, const char *locale, const uintN errorNumber);
 
+/* Implemented in jsclone.cpp. */
+
+extern JS_FRIEND_API(uint64_t)
+js_GetSCOffset(JSStructuredCloneWriter* writer);
+
 #endif /* jsfriendapi_h___ */