Date: Sun, 10 Mar 2013 21:05:08 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1206 - in trunk/www: firefox-nightly/files firefox/files seamonkey/files Message-ID: <201303102105.r2AL58q0056555@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Mar 10 21:05:08 2013
New Revision: 1206
Log:
regen and integrate openbsd fixes into webrtc patch
Submitted by: Landry Breuil <landry@openbsd.org> (via bugzilla)
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 Sat Mar 9 18:03:44 2013 (r1205)
+++ trunk/www/firefox-nightly/files/patch-bug807492 Sun Mar 10 21:05:08 2013 (r1206)
@@ -2,7 +2,7 @@
index 9bd1efa..1095a01 100644
--- config/system-headers
+++ config/system-headers
-@@ -1066,8 +1066,10 @@ gst/app/gstappsink.h
+@@ -1121,8 +1121,10 @@ gst/app/gstappsink.h
gst/app/gstappsrc.h
gst/video/video.h
sys/msg.h
@@ -17,7 +17,7 @@
index c167461..8346c11 100644
--- configure.in
+++ configure.in
-@@ -5208,17 +5219,17 @@ dnl --enable-webrtc to override. Can di
+@@ -5243,17 +5243,17 @@ dnl Turn off webrtc for OS's we don't handle yet, but allow
dnl --enable-webrtc to override. Can disable for everything in
dnl the master list above.
if test -n "$MOZ_WEBRTC"; then
@@ -40,7 +40,7 @@
index 9bd1efa..1095a01 100644
--- js/src/config/system-headers
+++ js/src/config/system-headers
-@@ -1066,8 +1066,10 @@ gst/app/gstappsink.h
+@@ -1121,8 +1121,10 @@ gst/app/gstappsink.h
gst/app/gstappsrc.h
gst/video/video.h
sys/msg.h
@@ -87,7 +87,7 @@
index c1d5bf4..2ecf2c7 100644
--- media/mtransport/test/Makefile.in
+++ media/mtransport/test/Makefile.in
-@@ -67,22 +67,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1
+@@ -73,22 +73,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1
else
#default_fallback; probably doesn't work
DEFINES += -D__Userspace_os_$(OS_TARGET)=1
@@ -117,7 +117,7 @@
index 0e1f8b4..9a4b995 100644
--- media/mtransport/third_party/nICEr/nicer.gyp
+++ media/mtransport/third_party/nICEr/nicer.gyp
-@@ -124,26 +124,36 @@
+@@ -126,26 +126,36 @@
'R_DEFINED_UINT2=uint16_t',
'R_DEFINED_INT4=int32_t',
'R_DEFINED_UINT4=uint32_t',
@@ -160,7 +160,27 @@
index b0b66b2..04fea94 100644
--- media/mtransport/third_party/nICEr/src/stun/addrs.c
+++ media/mtransport/third_party/nICEr/src/stun/addrs.c
-@@ -69,17 +69,17 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex
+@@ -50,17 +50,19 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex
+ #else
+ #include <syslog.h>
+ /* Work around an Android NDK < r8c bug */
+ #undef __unused
+ #include <linux/sysctl.h>
+ #endif
+ #include <net/if.h>
+ #ifndef LINUX
++#if !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #include <net/if_var.h>
++#endif
+ #include <net/if_dl.h>
+ #include <net/if_types.h>
+ #include <sys/sockio.h>
+ #else
+ #include <linux/if.h>
+ #endif
+ #include <net/route.h>
+
+@@ -75,17 +77,17 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex
#include <netdb.h>
#endif /* UNIX */
@@ -179,7 +199,7 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
-@@ -675,17 +675,17 @@ nr_stun_remove_duplicate_addrs(nr_transport_addr addrs[], int remove_loopback, i
+@@ -685,17 +687,17 @@ nr_stun_remove_duplicate_addrs(nr_transport_addr addrs[], int remove_loopback, i
}
int
@@ -202,12 +222,18 @@
index a3c51f9..eb65ac8 100644
--- media/mtransport/third_party/nICEr/src/stun/stun.h
+++ media/mtransport/third_party/nICEr/src/stun/stun.h
-@@ -40,17 +40,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+@@ -36,21 +36,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ #ifdef WIN32
+ #include <winsock2.h>
+ #else
#include <sys/param.h>
#include <sys/socket.h>
#include <net/if.h>
#ifndef LINUX
++#if !defined(__OpenBSD__) && !defined(__NetBSD__)
#include <net/if_var.h>
++#endif
#include <net/if_dl.h>
#include <net/if_types.h>
#endif
@@ -328,7 +354,7 @@
index 3cc8e1c..74016c6 100644
--- media/mtransport/third_party/nrappkit/nrappkit.gyp
+++ media/mtransport/third_party/nrappkit/nrappkit.gyp
-@@ -142,26 +142,36 @@
+@@ -142,26 +142,35 @@
'R_DEFINED_UINT2=uint16_t',
'R_DEFINED_INT4=int32_t',
'R_DEFINED_UINT4=uint32_t',
@@ -347,7 +373,6 @@
+ [ 'os_bsd == 1', {
+ 'defines' : [
+ 'BSD',
-+ 'USE_OWN_INET_NTOP',
+ ],
+ }],
+ [ 'OS == "mac" or os_bsd == 1', {
@@ -367,19 +392,63 @@
'NEW_STDIO'
'RETSIGTYPE=void',
'TIME_WITH_SYS_TIME_H=1',
+diff --git media/mtransport/third_party/nrappkit/src/log/r_log.c media/mtransport/third_party/nrappkit/src/log/r_log.c
+index efb7ef2..aebf578 100644
+--- media/mtransport/third_party/nrappkit/src/log/r_log.c
++++ media/mtransport/third_party/nrappkit/src/log/r_log.c
+@@ -43,16 +43,17 @@ static char *RCSSTRING __UNUSED__ ="$Id: r_log.c,v 1.10 2008/11/25 22:25:18 adam
+ #ifdef LINUX
+ #define _BSD_SOURCE
+ #endif
+
+ #include "r_log.h"
+ #include "hex.h"
+
+ #include <string.h>
++#include <errno.h>
+ #ifndef _MSC_VER
+ #include <strings.h>
+ #include <syslog.h>
+ #endif
+ #include <registry.h>
+ #include <time.h>
+
+
diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
index bcb1ec0..bb73591 100644
--- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
+++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-@@ -33,5 +33,5 @@
- #define _SYS_QUEUE_H_
-
+@@ -33,7 +33,7 @@
+ #ifndef _SYS_QUEUE_H_
+ #define _SYS_QUEUE_H_
+
-#ifndef DARWIN
-+#if !defined(BSD) && !defined(DARWIN)
++#if !defined(__FreeBSD__) && !defined(DARWIN)
#include <stddef.h>
#define __offsetof offsetof
#endif
-
+diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c
+index a7d4ff1..ff11a60 100644
+--- media/mtransport/third_party/nrappkit/src/util/util.c
++++ media/mtransport/third_party/nrappkit/src/util/util.c
+@@ -40,16 +40,17 @@
+ static char *RCSSTRING __UNUSED__ ="$Id: util.c,v 1.5 2007/11/21 00:09:13 adamcain Exp $";
+
+ #ifndef WIN32
+ #include <sys/uio.h>
+ #include <pwd.h>
+ #include <dirent.h>
+ #endif
+ #include <string.h>
++#include <errno.h>
+ #include <ctype.h>
+ #include <sys/stat.h>
+ #ifdef OPENSSL
+ #include <openssl/evp.h>
+ #endif
+ #include "nr_common.h"
+ #include "r_common.h"
+ #include "registry.h"
diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp
index 2a91e3d..31de641 100644
--- media/webrtc/signaling/signaling.gyp
@@ -493,7 +562,7 @@
index a30e330..cfbd8a3 100644
--- media/webrtc/signaling/test/Makefile.in
+++ media/webrtc/signaling/test/Makefile.in
-@@ -65,17 +65,17 @@ endif
+@@ -81,17 +81,17 @@ endif
ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
LIBS += \
$(XLIBS) \
@@ -603,6 +672,48 @@
+#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
@@ -705,9 +816,9 @@
WebRtc_UWord32 GetCurrentRTP(RtpRtcpClock* clock, WebRtc_UWord32 freq) {
const bool use_global_clock = (clock == NULL);
-@@ -313,17 +313,17 @@ bool OldTimestamp(uint32_t newTimestamp,
- * Misc utility routines
- */
+@@ -325,17 +325,17 @@ WebRtc_UWord16 GetPayloadDataLength(const WebRtcRTPHeader* rtp_header,
+ return static_cast<WebRtc_UWord16>(length);
+ }
#if defined(_WIN32)
bool StringCompare(const char* str1, const char* str2,
@@ -1128,7 +1239,7 @@
index 0cd85d0..45591be 100644
--- media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h
+++ media/webrtc/trunk/webrtc/system_wrappers/interface/tick_util.h
-@@ -189,17 +189,17 @@ inline WebRtc_Word64 TickTime::QueryOsFo
+@@ -189,17 +189,17 @@ inline WebRtc_Word64 TickTime::QueryOsForTicks() {
// 0x0fffffff ~3.1 days, the code will not take that long to execute
// so it must have been a wrap around.
if (old > 0xf0000000 && now < 0x0fffffff) {
@@ -1147,7 +1258,7 @@
clock_gettime(CLOCK_MONOTONIC, &ts);
#endif
result.ticks_ = 1000000000LL * static_cast<WebRtc_Word64>(ts.tv_sec) +
-@@ -236,34 +236,34 @@ inline WebRtc_Word64 TickTime::Milliseco
+@@ -236,34 +236,34 @@ inline WebRtc_Word64 TickTime::MillisecondTimestamp() {
#if _WIN32
#ifdef USE_QUERY_PERFORMANCE_COUNTER
LARGE_INTEGER qpfreq;
@@ -1184,7 +1295,7 @@
inline WebRtc_Word64 TickTime::Ticks() const {
return ticks_;
-@@ -273,33 +273,33 @@ inline WebRtc_Word64 TickTime::Milliseco
+@@ -273,33 +273,33 @@ inline WebRtc_Word64 TickTime::MillisecondsToTicks(const WebRtc_Word64 ms) {
#if _WIN32
#ifdef USE_QUERY_PERFORMANCE_COUNTER
LARGE_INTEGER qpfreq;
@@ -1220,7 +1331,7 @@
inline TickTime& TickTime::operator+=(const WebRtc_Word64& ticks) {
ticks_ += ticks;
-@@ -318,17 +318,17 @@ inline WebRtc_Word64 TickInterval::Milli
+@@ -318,17 +318,17 @@ inline WebRtc_Word64 TickInterval::Milliseconds() const {
#ifdef USE_QUERY_PERFORMANCE_COUNTER
LARGE_INTEGER qpfreq;
QueryPerformanceFrequency(&qpfreq);
@@ -1239,7 +1350,7 @@
#endif
}
-@@ -337,17 +337,17 @@ inline WebRtc_Word64 TickInterval::Micro
+@@ -337,17 +337,17 @@ inline WebRtc_Word64 TickInterval::Microseconds() const {
#ifdef USE_QUERY_PERFORMANCE_COUNTER
LARGE_INTEGER qpfreq;
QueryPerformanceFrequency(&qpfreq);
@@ -1326,7 +1437,7 @@
index 48835ab..16c6033 100644
--- media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable_posix.cc
+++ media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable_posix.cc
-@@ -74,17 +74,17 @@ void ConditionVariablePosix::SleepCS(Cri
+@@ -74,17 +74,17 @@ void ConditionVariablePosix::SleepCS(CriticalSectionWrapper& crit_sect) {
&crit_sect);
pthread_cond_wait(&cond_, &cs->mutex_);
}
@@ -1413,7 +1524,7 @@
WebRtc_UWord32 CpuInfo::number_of_cores_ = 0;
-@@ -36,29 +38,38 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo
+@@ -36,29 +38,38 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCores() {
WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
"Available number of cores:%d", number_of_cores_);
@@ -1486,7 +1597,7 @@
int ConvertToSystemPriority(ThreadPriority priority, int min_prio,
int max_prio) {
-@@ -136,16 +147,28 @@ ThreadPosix::ThreadPosix(ThreadRunFuncti
+@@ -136,16 +147,30 @@ ThreadPosix::ThreadPosix(ThreadRunFunction func, ThreadObj obj,
}
}
@@ -1499,6 +1610,8 @@
+ return _lwp_self();
+#elif defined(__DragonFly__)
+ return lwp_gettid();
++#elif defined(__OpenBSD__)
++ return reinterpret_cast<uintptr_t> (pthread_self());
+#elif defined(__FreeBSD__)
+# if __FreeBSD_version > 900030
+ return pthread_getthreadid_np();
@@ -1515,7 +1628,7 @@
int ThreadPosix::Construct() {
int result = 0;
#if !defined(WEBRTC_ANDROID)
-@@ -190,17 +196,17 @@ int ThreadPosix::Construct() {
+@@ -167,17 +192,17 @@ int ThreadPosix::Construct() {
}
ThreadPosix::~ThreadPosix() {
@@ -1534,7 +1647,7 @@
}
int result = pthread_attr_setdetachstate(&attr_, PTHREAD_CREATE_DETACHED);
// Set the stack stack size to 1M.
-@@ -232,31 +255,39 @@ bool ThreadPosix::Start(unsigned int& th
+@@ -232,31 +257,39 @@ bool ThreadPosix::Start(unsigned int& thread_id)
WEBRTC_TRACE(kTraceError, kTraceUtility, -1,
"unable to set thread priority");
}
@@ -1576,7 +1689,7 @@
#else
// "Normal" Linux.
const int result = sched_setaffinity(pid_,
-@@ -320,16 +351,20 @@ void ThreadPosix::Run() {
+@@ -320,16 +353,20 @@ void ThreadPosix::Run() {
pid_ = GetThreadId();
#endif
// The event the Start() is waiting for.
@@ -1597,6 +1710,29 @@
"Thread without name started");
}
bool alive = true;
+diff --git media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc
+index 2c7e59a..6f23fcb 100644
+--- media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc
++++ media/webrtc/trunk/webrtc/system_wrappers/source/trace_posix.cc
+@@ -49,17 +49,17 @@ TracePosix::~TracePosix() {
+ WebRtc_Word32 TracePosix::AddTime(char* trace_message,
+ const TraceLevel level) const {
+ struct timeval system_time_high_res;
+ if (gettimeofday(&system_time_high_res, 0) == -1) {
+ return -1;
+ }
+ struct tm buffer;
+ const struct tm* system_time =
+- localtime_r(&system_time_high_res.tv_sec, &buffer);
++ localtime_r((const time_t *)(&system_time_high_res.tv_sec), &buffer);
+
+ const WebRtc_UWord32 ms_time = system_time_high_res.tv_usec / 1000;
+ WebRtc_UWord32 prev_tickCount = 0;
+ if (level == kTraceApiCall) {
+ prev_tickCount = prev_tick_count_;
+ prev_tick_count_ = ms_time;
+ } else {
+ prev_tickCount = prev_api_tick_count_;
diff --git media/webrtc/trunk/webrtc/typedefs.h media/webrtc/trunk/webrtc/typedefs.h
index 6334490..852ebaa 100644
--- media/webrtc/trunk/webrtc/typedefs.h
@@ -1790,7 +1926,7 @@
generator_default_variables = {
}
-@@ -111,30 +112,44 @@ endif
+@@ -107,30 +108,44 @@ endif
def ensure_directory_exists(path):
dir = os.path.dirname(path)
Modified: trunk/www/firefox/files/patch-bug807492
==============================================================================
--- trunk/www/firefox/files/patch-bug807492 Sat Mar 9 18:03:44 2013 (r1205)
+++ trunk/www/firefox/files/patch-bug807492 Sun Mar 10 21:05:08 2013 (r1206)
@@ -2,7 +2,7 @@
index 9bd1efa..1095a01 100644
--- config/system-headers
+++ config/system-headers
-@@ -1066,8 +1066,10 @@ gst/app/gstappsink.h
+@@ -1121,8 +1121,10 @@ gst/app/gstappsink.h
gst/app/gstappsrc.h
gst/video/video.h
sys/msg.h
@@ -45,7 +45,7 @@
# -Werror=return-type - catches missing returns, zero false positives
# -Wtype-limits - catches overflow bugs, few false positives
# -Wempty-body - catches bugs, e.g. "if (c); foo();", few false positives
-@@ -5255,17 +5266,17 @@ dnl Turn off webrtc for OS's we don't ha
+@@ -5259,17 +5270,17 @@ dnl Turn off webrtc for OS's we don't handle yet, but allow
dnl --enable-webrtc to override. Can disable for everything in
dnl the master list above.
if test -n "$MOZ_WEBRTC"; then
@@ -64,7 +64,7 @@
;;
esac
fi
-@@ -9061,16 +9072,21 @@ elif test "${OS_TARGET}" = "Android"; th
+@@ -9065,16 +9076,21 @@ elif test "${OS_TARGET}" = "Android"; then
EXTRA_GYP_DEFINES="-D gtest_target_type=executable -D android_toolchain=${android_toolchain} -G os=android "
if test -n "$ARM_ARCH" && test "$ARM_ARCH" -lt 7; then
EXTRA_GYP_DEFINES+=" -D armv7=0 "
@@ -90,7 +90,7 @@
index 9bd1efa..1095a01 100644
--- js/src/config/system-headers
+++ js/src/config/system-headers
-@@ -1066,8 +1066,10 @@ gst/app/gstappsink.h
+@@ -1121,8 +1121,10 @@ gst/app/gstappsink.h
gst/app/gstappsrc.h
gst/video/video.h
sys/msg.h
@@ -210,7 +210,27 @@
index b0b66b2..04fea94 100644
--- media/mtransport/third_party/nICEr/src/stun/addrs.c
+++ media/mtransport/third_party/nICEr/src/stun/addrs.c
-@@ -69,17 +69,17 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex
+@@ -50,17 +50,19 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex
+ #else
+ #include <syslog.h>
+ /* Work around an Android NDK < r8c bug */
+ #undef __unused
+ #include <linux/sysctl.h>
+ #endif
+ #include <net/if.h>
+ #ifndef LINUX
++#if !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #include <net/if_var.h>
++#endif
+ #include <net/if_dl.h>
+ #include <net/if_types.h>
+ #include <sys/sockio.h>
+ #else
+ #include <linux/if.h>
+ #endif
+ #include <net/route.h>
+
+@@ -75,17 +77,17 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex
#include <netdb.h>
#endif /* UNIX */
@@ -229,7 +249,7 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
-@@ -675,17 +675,17 @@ nr_stun_remove_duplicate_addrs(nr_transport_addr addrs[], int remove_loopback, i
+@@ -685,17 +687,17 @@ nr_stun_remove_duplicate_addrs(nr_transport_addr addrs[], int remove_loopback, i
}
int
@@ -252,12 +272,18 @@
index a3c51f9..eb65ac8 100644
--- media/mtransport/third_party/nICEr/src/stun/stun.h
+++ media/mtransport/third_party/nICEr/src/stun/stun.h
-@@ -40,17 +40,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+@@ -36,21 +36,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ #ifdef WIN32
+ #include <winsock2.h>
+ #else
#include <sys/param.h>
#include <sys/socket.h>
#include <net/if.h>
#ifndef LINUX
++#if !defined(__OpenBSD__) && !defined(__NetBSD__)
#include <net/if_var.h>
++#endif
#include <net/if_dl.h>
#include <net/if_types.h>
#endif
@@ -416,6 +442,28 @@
'NEW_STDIO'
'RETSIGTYPE=void',
'TIME_WITH_SYS_TIME_H=1',
+diff --git media/mtransport/third_party/nrappkit/src/log/r_log.c media/mtransport/third_party/nrappkit/src/log/r_log.c
+index b25d5c2..b207b8c 100644
+--- media/mtransport/third_party/nrappkit/src/log/r_log.c
++++ media/mtransport/third_party/nrappkit/src/log/r_log.c
+@@ -43,16 +43,17 @@ static char *RCSSTRING __UNUSED__ ="$Id: r_log.c,v 1.10 2008/11/25 22:25:18 adam
+ #ifdef LINUX
+ #define _BSD_SOURCE
+ #endif
+
+ #include "r_log.h"
+ #include "hex.h"
+
+ #include <string.h>
++#include <errno.h>
+ #ifndef _MSC_VER
+ #include <strings.h>
+ #include <syslog.h>
+ #endif
+ #include <registry.h>
+ #include <time.h>
+
+
diff --git media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
index 15452e3..2c9651a 100644
--- media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
@@ -446,20 +494,20 @@
index bcb1ec0..bb73591 100644
--- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
+++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-@@ -33,5 +33,5 @@
- #define _SYS_QUEUE_H_
-
+@@ -33,7 +33,7 @@
+ #ifndef _SYS_QUEUE_H_
+ #define _SYS_QUEUE_H_
+
-#ifndef DARWIN
-+#if !defined(BSD) && !defined(DARWIN)
++#if !defined(__FreeBSD__) && !defined(DARWIN)
#include <stddef.h>
#define __offsetof offsetof
#endif
-
diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c
index 3aced8b..be020bb 100644
--- media/mtransport/third_party/nrappkit/src/util/util.c
+++ media/mtransport/third_party/nrappkit/src/util/util.c
-@@ -36,16 +36,19 @@
+@@ -36,20 +36,24 @@
ekr@rtfm.com Wed Dec 26 17:19:36 2001
*/
@@ -475,11 +523,16 @@
#include <dirent.h>
#endif
#include <string.h>
++#include <errno.h>
#include <ctype.h>
#include <sys/stat.h>
#ifdef OPENSSL
#include <openssl/evp.h>
-@@ -431,17 +434,17 @@ int nr_reg_uint8_fetch_and_check(NR_registry key, UINT8 min, UINT8 max, int log_
+ #endif
+ #include "nr_common.h"
+ #include "r_common.h"
+ #include "registry.h"
+@@ -431,17 +435,17 @@ int nr_reg_uint8_fetch_and_check(NR_registry key, UINT8 min, UINT8 max, int log_
abort:
if(die && _status){
r_log(log_fac,LOG_CRIT,"Exiting due to invalid configuration (key '%s')",key);
@@ -630,7 +683,7 @@
ifeq ($(OS_TARGET),Android)
LIBS += \
-@@ -65,17 +65,17 @@ endif
+@@ -76,17 +76,17 @@ endif
ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
LIBS += \
$(XLIBS) \
@@ -775,7 +828,7 @@
'..','../..',
],
'defines': [
-@@ -174,16 +181,28 @@
+@@ -176,16 +181,28 @@
'defines': [
'WEBRTC_LINUX',
'WEBRTC_THREAD_RR',
@@ -840,6 +893,48 @@
+#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
@@ -1280,7 +1375,7 @@
index 0a9765e..8d4bbf4 100644
--- media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi
+++ media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi
-@@ -50,17 +50,17 @@
+@@ -55,17 +55,17 @@
['include_internal_video_capture==0', {
'sources': [
'External/device_info_external.cc',
@@ -1299,7 +1394,7 @@
'Linux/video_capture_linux.h',
'Linux/device_info_linux.cc',
'Linux/video_capture_linux.cc',
-@@ -157,31 +157,35 @@
+@@ -162,31 +162,35 @@
'../interface',
],
'sources': [
@@ -1737,7 +1832,7 @@
namespace webrtc {
extern "C"
-@@ -116,16 +125,28 @@ ThreadPosix::ThreadPosix(ThreadRunFunction func, ThreadObj obj,
+@@ -116,16 +125,30 @@ ThreadPosix::ThreadPosix(ThreadRunFunction func, ThreadObj obj,
}
}
@@ -1750,6 +1845,8 @@
+ return _lwp_self();
+#elif defined(__DragonFly__)
+ return lwp_gettid();
++#elif defined(__OpenBSD__)
++ return reinterpret_cast<uintptr_t> (pthread_self());
+#elif defined(__FreeBSD__)
+# if __FreeBSD_version > 900030
+ return pthread_getthreadid_np();
@@ -1766,7 +1863,7 @@
int ThreadPosix::Construct()
{
int result = 0;
-@@ -154,16 +175,17 @@ ThreadPosix::~ThreadPosix()
+@@ -154,16 +177,17 @@ ThreadPosix::~ThreadPosix()
{
pthread_attr_destroy(&_attr);
delete _event;
@@ -1784,7 +1881,7 @@
#endif
{
if (!_runFunction)
-@@ -229,31 +251,39 @@ bool ThreadPosix::Start(unsigned int& /*threadID*/)
+@@ -229,31 +253,39 @@ bool ThreadPosix::Start(unsigned int& /*threadID*/)
{
return false;
}
@@ -1826,7 +1923,7 @@
#else
// "Normal" Linux.
const int result = sched_setaffinity(_pid,
-@@ -340,16 +370,20 @@ void ThreadPosix::Run()
+@@ -340,16 +372,20 @@ void ThreadPosix::Run()
#endif
// The event the Start() is waiting for.
_event->Set();
@@ -1847,6 +1944,29 @@
WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
"Thread without name started");
}
+diff --git media/webrtc/trunk/src/system_wrappers/source/trace_posix.cc media/webrtc/trunk/src/system_wrappers/source/trace_posix.cc
+index f3a5306..d9c2810 100644
+--- media/webrtc/trunk/src/system_wrappers/source/trace_posix.cc
++++ media/webrtc/trunk/src/system_wrappers/source/trace_posix.cc
+@@ -52,17 +52,17 @@ WebRtc_Word32 TracePosix::AddTime(char* traceMessage,
+ {
+ struct timeval systemTimeHighRes;
+ if (gettimeofday(&systemTimeHighRes, 0) == -1)
+ {
+ return -1;
+ }
+ struct tm buffer;
+ const struct tm* systemTime =
+- localtime_r(&systemTimeHighRes.tv_sec, &buffer);
++ localtime_r((const time_t *)(&systemTimeHighRes.tv_sec), &buffer);
+
+ const WebRtc_UWord32 ms_time = systemTimeHighRes.tv_usec / 1000;
+ WebRtc_UWord32 prevTickCount = 0;
+ if (level == kTraceApiCall)
+ {
+ prevTickCount = _prevTickCount;
+ _prevTickCount = ms_time;
+ } else {
diff --git media/webrtc/trunk/src/video_engine/vie_defines.h media/webrtc/trunk/src/video_engine/vie_defines.h
index 2cc18cc7..2c042a0 100644
--- media/webrtc/trunk/src/video_engine/vie_defines.h
@@ -1935,7 +2055,7 @@
index 7d4c729..4104719 100644
--- media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
+++ media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
-@@ -434,41 +434,44 @@ namespace webrtc
+@@ -437,41 +437,44 @@ namespace webrtc
#else
#define ANDROID_NOT_SUPPORTED(stat)
@@ -1981,7 +2101,7 @@
#define TRUE 1
#define SOCKADDR_IN struct sockaddr_in
#define UINT unsigned int
-@@ -576,13 +579,13 @@ namespace webrtc
+@@ -579,13 +582,13 @@ namespace webrtc
// Defines
// ----------------------------------------------------------------------------
Modified: trunk/www/seamonkey/files/patch-bug807492
==============================================================================
--- trunk/www/seamonkey/files/patch-bug807492 Sat Mar 9 18:03:44 2013 (r1205)
+++ trunk/www/seamonkey/files/patch-bug807492 Sun Mar 10 21:05:08 2013 (r1206)
@@ -2,7 +2,7 @@
index 9bd1efa..1095a01 100644
--- mozilla/config/system-headers
+++ mozilla/config/system-headers
-@@ -1066,8 +1066,10 @@ gst/app/gstappsink.h
+@@ -1121,8 +1121,10 @@ gst/app/gstappsink.h
gst/app/gstappsrc.h
gst/video/video.h
sys/msg.h
@@ -45,7 +45,7 @@
# -Werror=return-type - catches missing returns, zero false positives
# -Wtype-limits - catches overflow bugs, few false positives
# -Wempty-body - catches bugs, e.g. "if (c); foo();", few false positives
-@@ -5255,17 +5266,17 @@ dnl Turn off webrtc for OS's we don't ha
+@@ -5259,17 +5270,17 @@ dnl Turn off webrtc for OS's we don't handle yet, but allow
dnl --enable-webrtc to override. Can disable for everything in
dnl the master list above.
if test -n "$MOZ_WEBRTC"; then
@@ -64,7 +64,7 @@
;;
esac
fi
-@@ -9061,16 +9072,21 @@ elif test "${OS_TARGET}" = "Android"; th
+@@ -9065,16 +9076,21 @@ elif test "${OS_TARGET}" = "Android"; then
EXTRA_GYP_DEFINES="-D gtest_target_type=executable -D android_toolchain=${android_toolchain} -G os=android "
if test -n "$ARM_ARCH" && test "$ARM_ARCH" -lt 7; then
EXTRA_GYP_DEFINES+=" -D armv7=0 "
@@ -90,7 +90,7 @@
index 9bd1efa..1095a01 100644
--- mozilla/js/src/config/system-headers
+++ mozilla/js/src/config/system-headers
-@@ -1066,8 +1066,10 @@ gst/app/gstappsink.h
+@@ -1121,8 +1121,10 @@ gst/app/gstappsink.h
gst/app/gstappsrc.h
gst/video/video.h
sys/msg.h
@@ -210,7 +210,27 @@
index b0b66b2..04fea94 100644
--- mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c
+++ mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c
-@@ -69,17 +69,17 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex
+@@ -50,17 +50,19 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex
+ #else
+ #include <syslog.h>
+ /* Work around an Android NDK < r8c bug */
+ #undef __unused
+ #include <linux/sysctl.h>
+ #endif
+ #include <net/if.h>
+ #ifndef LINUX
++#if !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #include <net/if_var.h>
++#endif
+ #include <net/if_dl.h>
+ #include <net/if_types.h>
+ #include <sys/sockio.h>
+ #else
+ #include <linux/if.h>
+ #endif
+ #include <net/route.h>
+
+@@ -75,17 +77,17 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex
#include <netdb.h>
#endif /* UNIX */
@@ -229,7 +249,7 @@
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
-@@ -675,17 +675,17 @@ nr_stun_remove_duplicate_addrs(nr_transport_addr addrs[], int remove_loopback, i
+@@ -685,17 +687,17 @@ nr_stun_remove_duplicate_addrs(nr_transport_addr addrs[], int remove_loopback, i
}
int
@@ -252,12 +272,18 @@
index a3c51f9..eb65ac8 100644
--- mozilla/media/mtransport/third_party/nICEr/src/stun/stun.h
+++ mozilla/media/mtransport/third_party/nICEr/src/stun/stun.h
-@@ -40,17 +40,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+@@ -36,21 +36,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ #ifdef WIN32
+ #include <winsock2.h>
+ #else
#include <sys/param.h>
#include <sys/socket.h>
#include <net/if.h>
#ifndef LINUX
++#if !defined(__OpenBSD__) && !defined(__NetBSD__)
#include <net/if_var.h>
++#endif
#include <net/if_dl.h>
#include <net/if_types.h>
#endif
@@ -416,6 +442,28 @@
'NEW_STDIO'
'RETSIGTYPE=void',
'TIME_WITH_SYS_TIME_H=1',
+diff --git media/mtransport/third_party/nrappkit/src/log/r_log.c media/mtransport/third_party/nrappkit/src/log/r_log.c
+index b25d5c2..b207b8c 100644
+--- mozilla/media/mtransport/third_party/nrappkit/src/log/r_log.c
++++ mozilla/media/mtransport/third_party/nrappkit/src/log/r_log.c
+@@ -43,16 +43,17 @@ static char *RCSSTRING __UNUSED__ ="$Id: r_log.c,v 1.10 2008/11/25 22:25:18 adam
+ #ifdef LINUX
+ #define _BSD_SOURCE
+ #endif
+
+ #include "r_log.h"
+ #include "hex.h"
+
+ #include <string.h>
++#include <errno.h>
+ #ifndef _MSC_VER
+ #include <strings.h>
+ #include <syslog.h>
+ #endif
+ #include <registry.h>
+ #include <time.h>
+
+
diff --git media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
index 15452e3..2c9651a 100644
--- mozilla/media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
@@ -446,20 +494,20 @@
index bcb1ec0..bb73591 100644
--- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
+++ mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-@@ -33,5 +33,5 @@
- #define _SYS_QUEUE_H_
-
+@@ -33,7 +33,7 @@
+ #ifndef _SYS_QUEUE_H_
+ #define _SYS_QUEUE_H_
+
-#ifndef DARWIN
-+#if !defined(BSD) && !defined(DARWIN)
++#if !defined(__FreeBSD__) && !defined(DARWIN)
#include <stddef.h>
#define __offsetof offsetof
#endif
-
diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c
index 3aced8b..be020bb 100644
--- mozilla/media/mtransport/third_party/nrappkit/src/util/util.c
+++ mozilla/media/mtransport/third_party/nrappkit/src/util/util.c
-@@ -36,16 +36,19 @@
+@@ -36,20 +36,24 @@
ekr@rtfm.com Wed Dec 26 17:19:36 2001
*/
@@ -475,11 +523,16 @@
#include <dirent.h>
#endif
#include <string.h>
++#include <errno.h>
#include <ctype.h>
#include <sys/stat.h>
#ifdef OPENSSL
#include <openssl/evp.h>
-@@ -431,17 +434,17 @@ int nr_reg_uint8_fetch_and_check(NR_registry key, UINT8 min, UINT8 max, int log_
+ #endif
+ #include "nr_common.h"
+ #include "r_common.h"
+ #include "registry.h"
+@@ -431,17 +435,17 @@ int nr_reg_uint8_fetch_and_check(NR_registry key, UINT8 min, UINT8 max, int log_
abort:
if(die && _status){
r_log(log_fac,LOG_CRIT,"Exiting due to invalid configuration (key '%s')",key);
@@ -630,7 +683,7 @@
ifeq ($(OS_TARGET),Android)
LIBS += \
-@@ -65,17 +65,17 @@ endif
+@@ -76,17 +76,17 @@ endif
ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
LIBS += \
$(XLIBS) \
@@ -775,7 +828,7 @@
'..','../..',
],
'defines': [
-@@ -174,16 +181,28 @@
+@@ -176,16 +181,28 @@
'defines': [
'WEBRTC_LINUX',
'WEBRTC_THREAD_RR',
@@ -840,6 +893,48 @@
+#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
@@ -1280,7 +1375,7 @@
index 0a9765e..8d4bbf4 100644
--- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi
+++ mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi
-@@ -50,17 +50,17 @@
+@@ -55,17 +55,17 @@
['include_internal_video_capture==0', {
'sources': [
'External/device_info_external.cc',
@@ -1299,7 +1394,7 @@
'Linux/video_capture_linux.h',
'Linux/device_info_linux.cc',
'Linux/video_capture_linux.cc',
-@@ -157,31 +157,35 @@
+@@ -162,31 +162,35 @@
'../interface',
],
'sources': [
@@ -1737,7 +1832,7 @@
namespace webrtc {
extern "C"
-@@ -116,16 +125,28 @@ ThreadPosix::ThreadPosix(ThreadRunFunction func, ThreadObj obj,
+@@ -116,16 +125,30 @@ ThreadPosix::ThreadPosix(ThreadRunFunction func, ThreadObj obj,
}
}
@@ -1750,6 +1845,8 @@
+ return _lwp_self();
+#elif defined(__DragonFly__)
+ return lwp_gettid();
++#elif defined(__OpenBSD__)
++ return reinterpret_cast<uintptr_t> (pthread_self());
+#elif defined(__FreeBSD__)
+# if __FreeBSD_version > 900030
+ return pthread_getthreadid_np();
@@ -1766,7 +1863,7 @@
int ThreadPosix::Construct()
{
int result = 0;
-@@ -154,16 +175,17 @@ ThreadPosix::~ThreadPosix()
+@@ -154,16 +177,17 @@ ThreadPosix::~ThreadPosix()
{
pthread_attr_destroy(&_attr);
delete _event;
@@ -1784,7 +1881,7 @@
#endif
{
if (!_runFunction)
-@@ -229,31 +251,39 @@ bool ThreadPosix::Start(unsigned int& /*threadID*/)
+@@ -229,31 +253,39 @@ bool ThreadPosix::Start(unsigned int& /*threadID*/)
{
return false;
}
@@ -1826,7 +1923,7 @@
#else
// "Normal" Linux.
const int result = sched_setaffinity(_pid,
-@@ -340,16 +370,20 @@ void ThreadPosix::Run()
+@@ -340,16 +372,20 @@ void ThreadPosix::Run()
#endif
// The event the Start() is waiting for.
_event->Set();
@@ -1847,6 +1944,29 @@
WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
"Thread without name started");
}
+diff --git media/webrtc/trunk/src/system_wrappers/source/trace_posix.cc media/webrtc/trunk/src/system_wrappers/source/trace_posix.cc
+index f3a5306..d9c2810 100644
+--- mozilla/media/webrtc/trunk/src/system_wrappers/source/trace_posix.cc
++++ mozilla/media/webrtc/trunk/src/system_wrappers/source/trace_posix.cc
+@@ -52,17 +52,17 @@ WebRtc_Word32 TracePosix::AddTime(char* traceMessage,
+ {
+ struct timeval systemTimeHighRes;
+ if (gettimeofday(&systemTimeHighRes, 0) == -1)
+ {
+ return -1;
+ }
+ struct tm buffer;
+ const struct tm* systemTime =
+- localtime_r(&systemTimeHighRes.tv_sec, &buffer);
++ localtime_r((const time_t *)(&systemTimeHighRes.tv_sec), &buffer);
+
+ const WebRtc_UWord32 ms_time = systemTimeHighRes.tv_usec / 1000;
+ WebRtc_UWord32 prevTickCount = 0;
+ if (level == kTraceApiCall)
+ {
+ prevTickCount = _prevTickCount;
+ _prevTickCount = ms_time;
+ } else {
diff --git media/webrtc/trunk/src/video_engine/vie_defines.h media/webrtc/trunk/src/video_engine/vie_defines.h
index 2cc18cc7..2c042a0 100644
--- mozilla/media/webrtc/trunk/src/video_engine/vie_defines.h
@@ -1935,7 +2055,7 @@
index 7d4c729..4104719 100644
--- mozilla/media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
+++ mozilla/media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
-@@ -434,41 +434,44 @@ namespace webrtc
+@@ -437,41 +437,44 @@ namespace webrtc
#else
#define ANDROID_NOT_SUPPORTED(stat)
@@ -1981,7 +2101,7 @@
#define TRUE 1
#define SOCKADDR_IN struct sockaddr_in
#define UINT unsigned int
-@@ -576,13 +579,13 @@ namespace webrtc
+@@ -579,13 +582,13 @@ namespace webrtc
// Defines
// ----------------------------------------------------------------------------
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303102105.r2AL58q0056555>