Author: jbeich
Date: Mon Dec 9 12:16:38 2013
New Revision: 1440
Log:
fix webrtc crashing since ff25
Added:
trunk/www/firefox-nightly/files/patch-bug947862
trunk/www/firefox/files/patch-bug947862
trunk/www/seamonkey/files/patch-bug947862
Added: trunk/www/firefox-nightly/files/patch-bug947862
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug947862 Mon Dec 9 12:16:38
2013 (r1440)
@@ -0,0 +1,31 @@
+diff --git media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc
media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc
+index 7ef6c66..6ae1e97 100644
+--- media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc
++++ media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc
+@@ -15,7 +15,7 @@
+ #include <Windows.h>
+ #include <WinSock.h>
+ #include <MMSystem.h>
+-#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC))
++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC))
+ #include <sys/time.h>
+ #include <time.h>
+ #endif
+@@ -209,7 +209,7 @@ class WindowsRealTimeClock : public RealTimeClock {
+ WindowsHelpTimer* _helpTimer;
+ };
+
+-#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC))
++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC))
+ class UnixRealTimeClock : public RealTimeClock {
+ public:
+ UnixRealTimeClock() {}
+@@ -240,7 +240,7 @@ Clock* Clock::GetRealTimeClock() {
+ #if defined(_WIN32)
+ static WindowsRealTimeClock clock(&global_help_timer);
+ return &clock;
+-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC))
+ static UnixRealTimeClock clock;
+ return &clock;
+ #else
Added: trunk/www/firefox/files/patch-bug947862
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug947862 Mon Dec 9 12:16:38 2013
(r1440)
@@ -0,0 +1,31 @@
+diff --git media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc
media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc
+index 7ef6c66..6ae1e97 100644
+--- media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc
++++ media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc
+@@ -15,7 +15,7 @@
+ #include <Windows.h>
+ #include <WinSock.h>
+ #include <MMSystem.h>
+-#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC))
++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC))
+ #include <sys/time.h>
+ #include <time.h>
+ #endif
+@@ -209,7 +209,7 @@ class WindowsRealTimeClock : public RealTimeClock {
+ WindowsHelpTimer* _helpTimer;
+ };
+
+-#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC))
++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC))
+ class UnixRealTimeClock : public RealTimeClock {
+ public:
+ UnixRealTimeClock() {}
+@@ -240,7 +240,7 @@ Clock* Clock::GetRealTimeClock() {
+ #if defined(_WIN32)
+ static WindowsRealTimeClock clock(&global_help_timer);
+ return &clock;
+-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC))
+ static UnixRealTimeClock clock;
+ return &clock;
+ #else
Added: trunk/www/seamonkey/files/patch-bug947862
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug947862 Mon Dec 9 12:16:38 2013
(r1440)
@@ -0,0 +1,31 @@
+diff --git media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc
media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc
+index 7ef6c66..6ae1e97 100644
+--- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc
++++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/clock.cc
+@@ -15,7 +15,7 @@
+ #include <Windows.h>
+ #include <WinSock.h>
+ #include <MMSystem.h>
+-#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC))
++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC))
+ #include <sys/time.h>
+ #include <time.h>
+ #endif
+@@ -209,7 +209,7 @@ class WindowsRealTimeClock : public RealTimeClock {
+ WindowsHelpTimer* _helpTimer;
+ };
+
+-#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC))
++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC))
+ class UnixRealTimeClock : public RealTimeClock {
+ public:
+ UnixRealTimeClock() {}
+@@ -240,7 +240,7 @@ Clock* Clock::GetRealTimeClock() {
+ #if defined(_WIN32)
+ static WindowsRealTimeClock clock(&global_help_timer);
+ return &clock;
+-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
++#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_BSD) || (defined WEBRTC_MAC))
+ static UnixRealTimeClock clock;
+ return &clock;
+ #else
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
