www/firefox-esr/files/patch-bug784776


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22

--- intl/locale/src/unix/nsDateTimeFormatUnix.cpp~
+++ intl/locale/src/unix/nsDateTimeFormatUnix.cpp
@@ -100,7 +100,7 @@ void nsDateTimeFormatUnix::LocalePreferr
   struct tm *tmc;
   int i;
 
-  tt = time((time_t)NULL);
+  tt = time(NULL);
   tmc = localtime(&tt);
 
   tmc->tm_hour=22;    // put the test sample hour to 22:00 which is 10PM
--- xpcom/glue/nsBaseHashtable.h~
+++ xpcom/glue/nsBaseHashtable.h
@@ -147,7 +147,7 @@ public:
   {
     EntryType* ent = this->GetEntry(aKey);
     if (!ent)
-      return NULL;
+      return 0;
 
     return ent->mData;
   }