Bug 718300 - Stop including jsdate.h.
authorMs2ger <ms2ger@gmail.com>
Sun, 15 Jan 2012 17:50:51 +0100
changeset 10424 ff9d678c33716a97a5d8df5e1c41f45253cda5cc
parent 10423 600face6bd77ebf150f8176f7d9beead23ce9fab
child 10425 8bdd5d2f7ecef0f21f583a9307ba0ec9be90dfb6
push idunknown
push userunknown
push dateunknown
bugs718300
Bug 718300 - Stop including jsdate.h.
calendar/base/src/calDateTime.cpp
--- a/calendar/base/src/calDateTime.cpp
+++ b/calendar/base/src/calDateTime.cpp
@@ -44,17 +44,18 @@
 #include "calBaseCID.h"
 
 #include "nsServiceManagerUtils.h"
 #include "nsIClassInfoImpl.h"
 
 #include "calIErrors.h"
 #include "calDuration.h"
 
-#include "jsdate.h"
+#include "jsapi.h"
+#include "jsfriendapi.h"
 #include "prprf.h"
 
 extern "C" {
 #include "ical.h"
 }
 
 #define CAL_ATTR_SET_PRE NS_ENSURE_FALSE(mImmutable, NS_ERROR_OBJECT_IS_IMMUTABLE)
 #define CAL_ATTR_SET_POST Normalize()
@@ -673,19 +674,19 @@ calDateTime::GetProperty(nsIXPConnectWra
             LL_I2L(thousand, 1000);
             LL_DIV(tmp, mNativeTime, thousand);
             LL_L2D(msec, tmp);
             ensureTimezone();
 
             JSObject *obj;
             bool b;
             if (NS_SUCCEEDED(mTimezone->GetIsFloating(&b)) && b) {
-                obj = js_NewDateObject(cx, mYear, mMonth, mDay, mHour, mMinute, mSecond);
+                obj = JS_NewDateObject(cx, mYear, mMonth, mDay, mHour, mMinute, mSecond);
             } else {
-                obj = js_NewDateObjectMsec(cx, msec);
+                obj = JS_NewDateObjectMsec(cx, msec);
             }
 
             *vp = OBJECT_TO_JSVAL(obj);
             *_retval = true;
             return NS_SUCCESS_I_DID_SOMETHING;
         }
     }