Date: Thu, 23 Aug 2012 00:37:33 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r946 - in branches/experimental: mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files Message-ID: <201208230037.q7N0bXIj057980@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Aug 23 00:37:33 2012
New Revision: 946
Log:
fix some clang 3.2 errors (for 20120817 update)
Added:
branches/experimental/mail/thunderbird-esr/files/patch-bug784776
branches/experimental/mail/thunderbird/files/patch-bug784776
branches/experimental/www/firefox-esr/files/patch-bug784776
branches/experimental/www/firefox-nightly/files/patch-bug784776
branches/experimental/www/firefox/files/patch-bug784776
branches/experimental/www/libxul/files/patch-bug784776
branches/experimental/www/seamonkey/files/patch-bug784776
Added: branches/experimental/mail/thunderbird-esr/files/patch-bug784776
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-bug784776 Thu Aug 23 00:37:33 2012 (r946)
@@ -0,0 +1,22 @@
+--- mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp~
++++ mozilla/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
+--- mozilla/xpcom/glue/nsBaseHashtable.h~
++++ mozilla/xpcom/glue/nsBaseHashtable.h
+@@ -147,7 +147,7 @@ public:
+ {
+ EntryType* ent = this->GetEntry(aKey);
+ if (!ent)
+- return NULL;
++ return 0;
+
+ return ent->mData;
+ }
Added: branches/experimental/mail/thunderbird/files/patch-bug784776
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-bug784776 Thu Aug 23 00:37:33 2012 (r946)
@@ -0,0 +1,50 @@
+--- mozilla/content/media/MediaEngineDefault.cpp~
++++ mozilla/content/media/MediaEngineDefault.cpp
+@@ -232,12 +232,12 @@ nsresult
+ MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID)
+ {
+ if (mState != kAllocated) {
+- return NULL;
++ return 0;
+ }
+
+ mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
+ if (!mTimer) {
+- return NULL;
++ return 0;
+ }
+
+ mSource = aStream;
+--- mozilla/gfx/layers/opengl/ImageLayerOGL.cpp~
++++ mozilla/gfx/layers/opengl/ImageLayerOGL.cpp
+@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources()
+ {
+ if (mSharedHandle) {
+ gl()->ReleaseSharedHandle(mShareType, mSharedHandle);
+- mSharedHandle = NULL;
++ mSharedHandle = 0;
+ }
+
+ mYUVTexture[0].Release();
+--- mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp~
++++ mozilla/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
+--- mozilla/ipc/glue/CrossProcessMutex_unimplemented.cpp~
++++ mozilla/ipc/glue/CrossProcessMutex_unimplemented.cpp
+@@ -40,7 +40,7 @@ CrossProcessMutexHandle
+ CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle)
+ {
+ NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!");
+- return NULL;
++ return 0;
+ }
+
+ }
Added: branches/experimental/www/firefox-esr/files/patch-bug784776
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-bug784776 Thu Aug 23 00:37:33 2012 (r946)
@@ -0,0 +1,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;
+ }
Added: branches/experimental/www/firefox-nightly/files/patch-bug784776
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-bug784776 Thu Aug 23 00:37:33 2012 (r946)
@@ -0,0 +1,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
+--- ipc/glue/CrossProcessMutex_unimplemented.cpp~
++++ ipc/glue/CrossProcessMutex_unimplemented.cpp
+@@ -40,7 +40,7 @@ CrossProcessMutexHandle
+ CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle)
+ {
+ NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!");
+- return NULL;
++ return 0;
+ }
+
+ }
Added: branches/experimental/www/firefox/files/patch-bug784776
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-bug784776 Thu Aug 23 00:37:33 2012 (r946)
@@ -0,0 +1,50 @@
+--- content/media/MediaEngineDefault.cpp~
++++ content/media/MediaEngineDefault.cpp
+@@ -232,12 +232,12 @@ nsresult
+ MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID)
+ {
+ if (mState != kAllocated) {
+- return NULL;
++ return 0;
+ }
+
+ mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
+ if (!mTimer) {
+- return NULL;
++ return 0;
+ }
+
+ mSource = aStream;
+--- gfx/layers/opengl/ImageLayerOGL.cpp~
++++ gfx/layers/opengl/ImageLayerOGL.cpp
+@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources()
+ {
+ if (mSharedHandle) {
+ gl()->ReleaseSharedHandle(mShareType, mSharedHandle);
+- mSharedHandle = NULL;
++ mSharedHandle = 0;
+ }
+
+ mYUVTexture[0].Release();
+--- 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
+--- ipc/glue/CrossProcessMutex_unimplemented.cpp~
++++ ipc/glue/CrossProcessMutex_unimplemented.cpp
+@@ -40,7 +40,7 @@ CrossProcessMutexHandle
+ CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle)
+ {
+ NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!");
+- return NULL;
++ return 0;
+ }
+
+ }
Added: branches/experimental/www/libxul/files/patch-bug784776
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-bug784776 Thu Aug 23 00:37:33 2012 (r946)
@@ -0,0 +1,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;
+ }
Added: branches/experimental/www/seamonkey/files/patch-bug784776
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-bug784776 Thu Aug 23 00:37:33 2012 (r946)
@@ -0,0 +1,50 @@
+--- mozilla/content/media/MediaEngineDefault.cpp~
++++ mozilla/content/media/MediaEngineDefault.cpp
+@@ -232,12 +232,12 @@ nsresult
+ MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID)
+ {
+ if (mState != kAllocated) {
+- return NULL;
++ return 0;
+ }
+
+ mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
+ if (!mTimer) {
+- return NULL;
++ return 0;
+ }
+
+ mSource = aStream;
+--- mozilla/gfx/layers/opengl/ImageLayerOGL.cpp~
++++ mozilla/gfx/layers/opengl/ImageLayerOGL.cpp
+@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources()
+ {
+ if (mSharedHandle) {
+ gl()->ReleaseSharedHandle(mShareType, mSharedHandle);
+- mSharedHandle = NULL;
++ mSharedHandle = 0;
+ }
+
+ mYUVTexture[0].Release();
+--- mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp~
++++ mozilla/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
+--- mozilla/ipc/glue/CrossProcessMutex_unimplemented.cpp~
++++ mozilla/ipc/glue/CrossProcessMutex_unimplemented.cpp
+@@ -40,7 +40,7 @@ CrossProcessMutexHandle
+ CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle)
+ {
+ NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!");
+- return NULL;
++ return 0;
+ }
+
+ }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208230037.q7N0bXIj057980>