Date: Sun, 24 Mar 2013 22:35:12 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1220 - in trunk/www: firefox-nightly/files firefox/files seamonkey/files Message-ID: <201303242235.r2OMZCtc021536@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Mar 24 22:35:12 2013
New Revision: 1220
Log:
remove no longer needed hunk for openbsd
Modified:
trunk/www/firefox-nightly/files/patch-bug807492
trunk/www/firefox/files/patch-bug807492
trunk/www/seamonkey/files/patch-bug807492
Modified: trunk/www/firefox-nightly/files/patch-bug807492
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492 Sun Mar 24 01:32:19 2013 (r1219)
+++ trunk/www/firefox-nightly/files/patch-bug807492 Sun Mar 24 22:35:12 2013 (r1220)
@@ -672,48 +672,6 @@
+#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
-diff --git media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
-index 8f3c7c8..7b1cc3f 100644
---- media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
-+++ media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
-@@ -33,17 +33,17 @@
-
- // TODO(grunell): Either put inside webrtc namespace or use webrtc:: instead.
- using namespace webrtc;
-
- namespace webrtc_adm_linux {
-
- inline static const char *GetDllError() {
- #ifdef WEBRTC_LINUX
-- char *err = dlerror();
-+ const char *err = dlerror();
- if (err) {
- return err;
- } else {
- return "No error";
- }
- #else
- #error Not implemented
- #endif
-@@ -73,17 +73,17 @@ void InternalUnloadDll(DllHandle handle) {
- #endif
- }
-
- static bool LoadSymbol(DllHandle handle,
- const char *symbol_name,
- void **symbol) {
- #ifdef WEBRTC_LINUX
- *symbol = dlsym(handle, symbol_name);
-- char *err = dlerror();
-+ const char *err = dlerror();
- if (err) {
- WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1,
- "Error loading symbol %s : %d", symbol_name, err);
- return false;
- } else if (!*symbol) {
- WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1,
- "Symbol %s is NULL", symbol_name);
- return false;
diff --git media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
index bdad224..39e1132 100644
--- media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
Modified: trunk/www/firefox/files/patch-bug807492
==============================================================================
--- trunk/www/firefox/files/patch-bug807492 Sun Mar 24 01:32:19 2013 (r1219)
+++ trunk/www/firefox/files/patch-bug807492 Sun Mar 24 22:35:12 2013 (r1220)
@@ -893,48 +893,6 @@
+#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
-diff --git media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc
-index 8f3c7c8..7b1cc3f 100644
---- media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc
-+++ media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc
-@@ -33,17 +33,17 @@
-
- // TODO(grunell): Either put inside webrtc namespace or use webrtc:: instead.
- using namespace webrtc;
-
- namespace webrtc_adm_linux {
-
- inline static const char *GetDllError() {
- #ifdef WEBRTC_LINUX
-- char *err = dlerror();
-+ const char *err = dlerror();
- if (err) {
- return err;
- } else {
- return "No error";
- }
- #else
- #error Not implemented
- #endif
-@@ -73,17 +73,17 @@ void InternalUnloadDll(DllHandle handle) {
- #endif
- }
-
- static bool LoadSymbol(DllHandle handle,
- const char *symbol_name,
- void **symbol) {
- #ifdef WEBRTC_LINUX
- *symbol = dlsym(handle, symbol_name);
-- char *err = dlerror();
-+ const char *err = dlerror();
- if (err) {
- WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1,
- "Error loading symbol %s : %d", symbol_name, err);
- return false;
- } else if (!*symbol) {
- WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1,
- "Symbol %s is NULL", symbol_name);
- return false;
diff --git media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc
index bdad224..39e1132 100644
--- media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc
Modified: trunk/www/seamonkey/files/patch-bug807492
==============================================================================
--- trunk/www/seamonkey/files/patch-bug807492 Sun Mar 24 01:32:19 2013 (r1219)
+++ trunk/www/seamonkey/files/patch-bug807492 Sun Mar 24 22:35:12 2013 (r1220)
@@ -893,48 +893,6 @@
+#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
-diff --git media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc
-index 8f3c7c8..7b1cc3f 100644
---- mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc
-+++ mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc
-@@ -33,17 +33,17 @@
-
- // TODO(grunell): Either put inside webrtc namespace or use webrtc:: instead.
- using namespace webrtc;
-
- namespace webrtc_adm_linux {
-
- inline static const char *GetDllError() {
- #ifdef WEBRTC_LINUX
-- char *err = dlerror();
-+ const char *err = dlerror();
- if (err) {
- return err;
- } else {
- return "No error";
- }
- #else
- #error Not implemented
- #endif
-@@ -73,17 +73,17 @@ void InternalUnloadDll(DllHandle handle) {
- #endif
- }
-
- static bool LoadSymbol(DllHandle handle,
- const char *symbol_name,
- void **symbol) {
- #ifdef WEBRTC_LINUX
- *symbol = dlsym(handle, symbol_name);
-- char *err = dlerror();
-+ const char *err = dlerror();
- if (err) {
- WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1,
- "Error loading symbol %s : %d", symbol_name, err);
- return false;
- } else if (!*symbol) {
- WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1,
- "Symbol %s is NULL", symbol_name);
- return false;
diff --git media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc
index bdad224..39e1132 100644
--- mozilla/media/webrtc/trunk/src/modules/rtp_rtcp/source/forward_error_correction.cc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303242235.r2OMZCtc021536>