Date: Tue, 26 Feb 2013 14:37:32 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312980 - head/www/seamonkey/files Message-ID: <201302261437.r1QEbW8q042953@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Tue Feb 26 14:37:32 2013 New Revision: 312980 URL: http://svnweb.freebsd.org/changeset/ports/312980 Log: - Rename this patch to fit in the new portsnap code http://lists.freebsd.org/pipermail/freebsd-gecko/2013-February/003146.html Requested by: Colin Percival <cperciva@freebsd.org> Added: head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebind_linux.cc - copied unchanged from r312979, head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc Deleted: head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc Copied: head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebind_linux.cc (from r312979, head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebind_linux.cc Tue Feb 26 14:37:32 2013 (r312980, copy of r312979, head/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc) @@ -0,0 +1,37 @@ +--- 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 +@@ -31,6 +31,10 @@ + #include <dlfcn.h> + #endif + ++#ifdef __FreeBSD__ ++#include <osreldate.h> ++#endif ++ + // TODO(grunell): Either put inside webrtc namespace or use webrtc:: instead. + using namespace webrtc; + +@@ -38,7 +42,11 @@ namespace webrtc_adm_linux { + + inline static const char *GetDllError() { + #ifdef WEBRTC_LINUX ++#if __FreeBSD_version < 800505 ++ const char *err = dlerror(); ++#else + char *err = dlerror(); ++#endif + if (err) { + return err; + } else { +@@ -78,7 +86,11 @@ static bool LoadSymbol(DllHandle handle, + void **symbol) { + #ifdef WEBRTC_LINUX + *symbol = dlsym(handle, symbol_name); ++#if __FreeBSD_version < 800505 ++ const char *err = dlerror(); ++#else + char *err = dlerror(); ++#endif + if (err) { + WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, + "Error loading symbol %s : %d", symbol_name, err);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302261437.r1QEbW8q042953>