Date: Wed, 24 Apr 2013 04:38:35 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1254 - in trunk/www: firefox-nightly/files firefox/files seamonkey/files Message-ID: <201304240438.r3O4cZmJ006538@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Apr 24 04:38:35 2013 New Revision: 1254 Log: improve std::abs workaround to account for gcc48 Reported by: mi Deleted: trunk/www/firefox-nightly/files/patch-bug824317 Modified: trunk/www/firefox/files/patch-bug824317 trunk/www/seamonkey/files/patch-bug824317 Deleted: trunk/www/firefox-nightly/files/patch-bug824317 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug824317 Wed Apr 24 04:38:35 2013 (r1253) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ -diff --git a/xpcom/string/public/nsAlgorithm.h b/xpcom/string/public/nsAlgorithm.h -index fa50194a..c5f5737 100644 ---- xpcom/string/public/nsAlgorithm.h -+++ xpcom/string/public/nsAlgorithm.h -@@ -42,7 +42,8 @@ NS_MAX( const T& a, const T& b ) - return a > b ? a : b; - } - --#if defined(_MSC_VER) && (_MSC_VER < 1600) -+#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || \ -+ (defined(_GLIBCXX_USE_LONG_LONG) && (!_GLIBCXX_USE_C99 || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC)) - namespace std { - inline - long long Modified: trunk/www/firefox/files/patch-bug824317 ============================================================================== --- trunk/www/firefox/files/patch-bug824317 Fri Apr 19 22:08:49 2013 (r1253) +++ trunk/www/firefox/files/patch-bug824317 Wed Apr 24 04:38:35 2013 (r1254) @@ -2,13 +2,15 @@ index fa50194a..c5f5737 100644 --- xpcom/string/public/nsAlgorithm.h +++ xpcom/string/public/nsAlgorithm.h -@@ -42,7 +42,8 @@ NS_MAX( const T& a, const T& b ) +@@ -42,7 +42,10 @@ NS_MAX( const T& a, const T& b ) return a > b ? a : b; } -#if defined(_MSC_VER) && (_MSC_VER < 1600) +#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || \ -+ (defined(_GLIBCXX_USE_LONG_LONG) && (!_GLIBCXX_USE_C99 || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC)) ++ ((defined(__GLIBCXX__) && __GLIBCXX__ < 20121005) && \ ++ (defined(_GLIBCXX_USE_LONG_LONG) && \ ++ (!_GLIBCXX_USE_C99 || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC))) namespace std { inline long long Modified: trunk/www/seamonkey/files/patch-bug824317 ============================================================================== --- trunk/www/seamonkey/files/patch-bug824317 Fri Apr 19 22:08:49 2013 (r1253) +++ trunk/www/seamonkey/files/patch-bug824317 Wed Apr 24 04:38:35 2013 (r1254) @@ -2,13 +2,15 @@ index fa50194a..c5f5737 100644 --- mozilla/xpcom/string/public/nsAlgorithm.h +++ mozilla/xpcom/string/public/nsAlgorithm.h -@@ -42,7 +42,8 @@ NS_MAX( const T& a, const T& b ) +@@ -42,7 +42,10 @@ NS_MAX( const T& a, const T& b ) return a > b ? a : b; } -#if defined(_MSC_VER) && (_MSC_VER < 1600) +#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || \ -+ (defined(_GLIBCXX_USE_LONG_LONG) && (!_GLIBCXX_USE_C99 || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC)) ++ ((defined(__GLIBCXX__) && __GLIBCXX__ < 20121005) && \ ++ (defined(_GLIBCXX_USE_LONG_LONG) && \ ++ (!_GLIBCXX_USE_C99 || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC))) namespace std { inline long long
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304240438.r3O4cZmJ006538>