diff --git a/dom/indexedDB/Key.cpp b/dom/indexedDB/Key.cpp index 440e9a1ab14..cc2d39ebd09 100644 --- a/dom/indexedDB/Key.cpp +++ b/dom/indexedDB/Key.cpp @@ -39,7 +39,7 @@ #include "Key.h" #include "nsIStreamBufferAccess.h" -#include "jsdate.h" +#include "jsfriendapi.h" #include "nsAlgorithm.h" #include "nsContentUtils.h" #include "nsJSUtils.h" diff --git a/dom/sms/src/SmsMessage.cpp b/dom/sms/src/SmsMessage.cpp index b5f8df04b7a..aeab9cf0020 100644 --- a/dom/sms/src/SmsMessage.cpp +++ b/dom/sms/src/SmsMessage.cpp @@ -39,7 +39,7 @@ #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) diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 07219e2e2d6..43c88ad1e67 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -196,7 +196,6 @@ INSTALLED_HEADERS = \ jscntxt.h \ jscompat.h \ jscrashreport.h \ - jsdate.h \ jsdbgapi.h \ jsdhash.h \ jsfriendapi.h \ diff --git a/js/src/jsdate.h b/js/src/jsdate.h index 431b0b9c095..4d3545b4797 100644 --- a/js/src/jsdate.h +++ b/js/src/jsdate.h @@ -77,13 +77,6 @@ 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); @@ -102,9 +95,6 @@ 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) diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h index d046a52d45f..e3b3b8413dd 100644 --- a/js/src/jsfriendapi.h +++ b/js/src/jsfriendapi.h @@ -498,4 +498,16 @@ js_GetClassPrototype(JSContext *cx, JSObject *scope, JSProtoKey protoKey, #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___ */ diff --git a/storage/src/mozStoragePrivateHelpers.cpp b/storage/src/mozStoragePrivateHelpers.cpp index 11b65c850b4..5fed1d102b1 100644 --- a/storage/src/mozStoragePrivateHelpers.cpp +++ b/storage/src/mozStoragePrivateHelpers.cpp @@ -41,7 +41,7 @@ #include "sqlite3.h" #include "jsapi.h" -#include "jsdate.h" +#include "jsfriendapi.h" #include "nsPrintfCString.h" #include "nsString.h"