bug 343027 - syncs branch and trunk files. r=jminta

calendar/base/build/calBaseModule.cpp

@@ -37,7 +37,10 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsIGenericFactory.h"
+
+#ifndef MOZILLA_1_8_BRANCH
 #include "nsIClassInfoImpl.h"
+#endif
 
 #include "calDateTime.h"
 #include "calDuration.h"

calendar/base/src/calDateTime.cpp

@@ -45,7 +45,11 @@
 
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
+
+#ifndef MOZILLA_1_8_BRANCH
 #include "nsIClassInfoImpl.h"
+#endif
+
 #include "calIICSService.h"
 #include "calIDuration.h"
 #include "calIErrors.h"

calendar/base/src/calDuration.cpp

@@ -43,7 +43,10 @@
 
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
+
+#ifndef MOZILLA_1_8_BRANCH
 #include "nsIClassInfoImpl.h"
+#endif
 
 #define SECONDS_PER_WEEK   604800
 #define SECONDS_PER_DAY     86400

calendar/base/src/calICSService.cpp

@@ -48,7 +48,10 @@
 #include "nsStringEnumerator.h"
 #include "nsCRT.h"
 #include "nsStringStream.h"
+
+#ifndef MOZILLA_1_8_BRANCH
 #include "nsIClassInfoImpl.h"
+#endif
 
 #include "calIEvent.h"
 #include "calBaseCID.h"

calendar/base/src/calRecurrenceDate.cpp

@@ -45,7 +45,11 @@
 #include "nsServiceManagerUtils.h"
 
 #include "calICSService.h"
+
+#ifndef MOZILLA_1_8_BRANCH
 #include "nsIClassInfoImpl.h"
+#endif
+
 #include "calBaseCID.h"
 
 static NS_DEFINE_CID(kCalICSService, CAL_ICSSERVICE_CID);

calendar/base/src/calRecurrenceDateSet.cpp

@@ -43,7 +43,10 @@
 #include "calIEvent.h"
 
 #include "calICSService.h"
+
+#ifndef MOZILLA_1_8_BRANCH
 #include "nsIClassInfoImpl.h"
+#endif
 
 extern "C" {
     #include "ical.h"

calendar/base/src/calRecurrenceRule.cpp

@@ -45,7 +45,10 @@
 #include "calIEvent.h"
 
 #include "calICSService.h"
+
+#ifndef MOZILLA_1_8_BRANCH
 #include "nsIClassInfoImpl.h"
+#endif
 
 extern "C" {
     #include "ical.h"

calendar/sunbird/app/Makefile.in

@@ -164,6 +164,9 @@ endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
+ifdef MOZILLA_1_8_BRANCH
+OS_LIBS += $(call EXPAND_LIBNAME,gdi32)
+endif
 ifdef MOZ_ENABLE_CAIRO_GFX
 OS_LIBS += $(call EXPAND_LIBNAME,usp10)
 endif

calendar/sunbird/app/splash.rc

@@ -61,6 +61,13 @@ END
 // files into a single .rc file, and then use that to build the single .res
 // file for the .exe.
 
+#ifdef MOZILLA_1_8_BRANCH
+// We need this cursor for versions of Windows that don't support IDC_HAND,
+// namely Win95 and NT4.
+#define IDC_SELECTANCHOR                4100
+IDC_SELECTANCHOR        CURSOR  DISCARDABLE     "../../widget/src/build/res/select.cur"
+#endif
+
 #define IDC_GRAB                        4101
 #define IDC_GRABBING                    4102
 #define IDC_CELL                        4103