Bug 677079 - Part c: Stop installing jsdate.h; r=Waldo
authorMs2ger <ms2ger@gmail.com>
Sun, 15 Jan 2012 09:13:07 +0100
changeset 85680 4f665744b6e65d4db1b11757eb2e98e74d155152
parent 85679 1668811de954f540bd9ca0386a998557ee688fd8
child 85681 ebd92ba20fd1379cbd7a6a155dca371daf56cdf5
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)
reviewersWaldo
bugs677079
milestone12.0a1
Bug 677079 - Part c: Stop installing jsdate.h; r=Waldo
dom/indexedDB/Key.cpp
dom/sms/src/SmsMessage.cpp
js/src/Makefile.in
js/src/jsdate.h
js/src/jsfriendapi.h
storage/src/mozStoragePrivateHelpers.cpp
--- a/dom/indexedDB/Key.cpp
+++ b/dom/indexedDB/Key.cpp
@@ -34,17 +34,17 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "Key.h"
 #include "nsIStreamBufferAccess.h"
-#include "jsdate.h"
+#include "jsfriendapi.h"
 #include "nsAlgorithm.h"
 #include "nsContentUtils.h"
 #include "nsJSUtils.h"
 #include "xpcpublic.h"
 
 USING_INDEXEDDB_NAMESPACE
 
 /*
--- a/dom/sms/src/SmsMessage.cpp
+++ b/dom/sms/src/SmsMessage.cpp
@@ -34,17 +34,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "SmsMessage.h"
 #include "nsIDOMClassInfo.h"
 #include "jsapi.h" // For OBJECT_TO_JSVAL and JS_NewDateObjectMsec
-#include "jsdate.h" // For js_DateGetMsecSinceEpoch
+#include "jsfriendapi.h" // For js_DateGetMsecSinceEpoch
 #include "Constants.h"
 
 DOMCI_DATA(MozSmsMessage, mozilla::dom::sms::SmsMessage)
 
 namespace mozilla {
 namespace dom {
 namespace sms {
 
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -191,17 +191,16 @@ INSTALLED_HEADERS = \
 		jsapi.h \
 		jsatom.h \
 		jsclass.h \
 		jsclist.h \
 		jsclone.h \
 		jscntxt.h \
 		jscompat.h \
 		jscrashreport.h \
-		jsdate.h \
 		jsdbgapi.h \
 		jsdhash.h \
 		jsfriendapi.h \
 		jsgc.h \
 		jscell.h \
 		jsgcchunk.h \
 		jsgcstats.h \
 		jshash.h \
--- a/js/src/jsdate.h
+++ b/js/src/jsdate.h
@@ -72,23 +72,16 @@ js_NewDateObjectMsec(JSContext* cx, jsdo
  * Assert that mon < 12 to help catch off-by-one user errors, which are common
  * due to the 0-based month numbering copied into JS from Java (java.util.Date
  * in 1995).
  */
 extern JS_FRIEND_API(JSObject*)
 js_NewDateObject(JSContext* cx, int year, int mon, int mday,
                  int hour, int min, int sec);
 
-/*
- * Detect whether the internal date value is NaN.  (Because failure is
- * out-of-band for js_DateGet*)
- */
-extern JS_FRIEND_API(JSBool)
-js_DateIsValid(JSContext *cx, JSObject* obj);
-
 extern JS_FRIEND_API(int)
 js_DateGetYear(JSContext *cx, JSObject* obj);
 
 extern JS_FRIEND_API(int)
 js_DateGetMonth(JSContext *cx, JSObject* obj);
 
 extern JS_FRIEND_API(int)
 js_DateGetDate(JSContext *cx, JSObject* obj);
@@ -97,19 +90,16 @@ extern JS_FRIEND_API(int)
 js_DateGetHours(JSContext *cx, JSObject* obj);
 
 extern JS_FRIEND_API(int)
 js_DateGetMinutes(JSContext *cx, JSObject* obj);
 
 extern JS_FRIEND_API(int)
 js_DateGetSeconds(JSContext *cx, JSObject* obj);
 
-extern JS_FRIEND_API(jsdouble)
-js_DateGetMsecSinceEpoch(JSContext *cx, JSObject *obj);
-
 typedef uint32_t JSIntervalTime;
 
 extern JS_FRIEND_API(JSIntervalTime)
 js_IntervalNow();
 
 /* Date constructor native. Exposed only so the JIT can know its address. */
 JSBool
 js_Date(JSContext *cx, uintN argc, js::Value *vp);
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -493,9 +493,21 @@ class JS_FRIEND_API(AutoLockGC)
  * JSProto_Null, clasp must non-null.
  */
 extern JS_FRIEND_API(JSBool)
 js_GetClassPrototype(JSContext *cx, JSObject *scope, JSProtoKey protoKey,
                      JSObject **protop, js::Class *clasp = NULL);
 
 #endif
 
+/* Implemented in jsdate.cpp. */
+
+/*
+ * Detect whether the internal date value is NaN.  (Because failure is
+ * out-of-band for js_DateGet*)
+ */
+extern JS_FRIEND_API(JSBool)
+js_DateIsValid(JSContext *cx, JSObject* obj);
+
+extern JS_FRIEND_API(double)
+js_DateGetMsecSinceEpoch(JSContext *cx, JSObject *obj);
+
 #endif /* jsfriendapi_h___ */
--- a/storage/src/mozStoragePrivateHelpers.cpp
+++ b/storage/src/mozStoragePrivateHelpers.cpp
@@ -36,17 +36,17 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "sqlite3.h"
 
 #include "jsapi.h"
-#include "jsdate.h"
+#include "jsfriendapi.h"
 
 #include "nsPrintfCString.h"
 #include "nsString.h"
 #include "nsError.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/CondVar.h"
 #include "nsThreadUtils.h"
 #include "nsJSUtils.h"