Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Jan 2013 19:39:47 GMT
From:      svn-freebsd-gecko@chruetertee.ch
To:        freebsd-gecko@freebsd.org
Subject:   [SVN-Commit] r1136 - in trunk: mail/thunderbird/files www/firefox/files www/seamonkey/files
Message-ID:  <201301101939.r0AJdlXB076130@trillian.chruetertee.ch>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Jan 10 19:39:47 2013
New Revision: 1136

Log:
unbreak gecko18 build on i386 with gcc42

Reported by:	flo

Added:
   trunk/mail/thunderbird/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h
   trunk/www/firefox/files/patch-content-base-src-nsTextFragmentImpl.h
   trunk/www/seamonkey/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h

Added: trunk/mail/thunderbird/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h	Thu Jan 10 19:39:47 2013	(r1136)
@@ -0,0 +1,14 @@
+--- mozilla/content/base/src/nsTextFragmentImpl.h
++++ mozilla/content/base/src/nsTextFragmentImpl.h
+@@ -16,7 +16,11 @@ template<> struct Non8BitParameters<4> {
+ };
+ 
+ template<> struct Non8BitParameters<8> {
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
++  static inline size_t mask() { return 0xff00ff00ff00ff00ULL; }
++#else
+   static inline size_t mask() { return 0xff00ff00ff00ff00; }
++#endif
+   static inline uint32_t alignMask() { return 0x7; }
+   static inline uint32_t numUnicharsPerWord() { return 4; }
+ };

Added: trunk/www/firefox/files/patch-content-base-src-nsTextFragmentImpl.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-content-base-src-nsTextFragmentImpl.h	Thu Jan 10 19:39:47 2013	(r1136)
@@ -0,0 +1,14 @@
+--- content/base/src/nsTextFragmentImpl.h
++++ content/base/src/nsTextFragmentImpl.h
+@@ -16,7 +16,11 @@ template<> struct Non8BitParameters<4> {
+ };
+ 
+ template<> struct Non8BitParameters<8> {
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
++  static inline size_t mask() { return 0xff00ff00ff00ff00ULL; }
++#else
+   static inline size_t mask() { return 0xff00ff00ff00ff00; }
++#endif
+   static inline uint32_t alignMask() { return 0x7; }
+   static inline uint32_t numUnicharsPerWord() { return 4; }
+ };

Added: trunk/www/seamonkey/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h	Thu Jan 10 19:39:47 2013	(r1136)
@@ -0,0 +1,14 @@
+--- mozilla/content/base/src/nsTextFragmentImpl.h
++++ mozilla/content/base/src/nsTextFragmentImpl.h
+@@ -16,7 +16,11 @@ template<> struct Non8BitParameters<4> {
+ };
+ 
+ template<> struct Non8BitParameters<8> {
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
++  static inline size_t mask() { return 0xff00ff00ff00ff00ULL; }
++#else
+   static inline size_t mask() { return 0xff00ff00ff00ff00; }
++#endif
+   static inline uint32_t alignMask() { return 0x7; }
+   static inline uint32_t numUnicharsPerWord() { return 4; }
+ };



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301101939.r0AJdlXB076130>