18 lines
909 B
Text
18 lines
909 B
Text
$NetBSD: patch-xpcom_io_nsMultiplexInputStream_cpp,v 1.1 2013/05/24 03:28:05 makoto Exp $
|
|
|
|
Fix PR/47722, dragonfly (gcc 4.7) build problem:
|
|
error: no matching function for call to
|
|
'NS_MIN(int64_t&, __gnu_cxx::__enable_if<true, double>::__type)'
|
|
devel/xulrunner/work/mozilla-release/xpcom/io/nsMultiplexInputStream.cpp:532:83
|
|
|
|
--- xpcom/io/nsMultiplexInputStream.cpp.orig 2013-05-11 19:19:56.000000000 +0000
|
|
+++ xpcom/io/nsMultiplexInputStream.cpp
|
|
@@ -529,7 +529,7 @@ nsMultiplexInputStream::Seek(int32_t aWh
|
|
rv = stream->Tell(&avail);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
- int64_t newPos = streamPos + XPCOM_MIN(avail, std::abs(remaining));
|
|
+ int64_t newPos = streamPos + XPCOM_MIN(avail, (int64_t)std::abs(remaining));
|
|
|
|
rv = stream->Seek(NS_SEEK_END, -newPos);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|