Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/firefox3-09-compiler-workaround.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 17060 7620508144e5
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17060
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
     1
 
--- a/js/src/xpconnect/src/xpcconvert.cpp	Tue Oct 13 01:02:04 2009
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
     2
 
+++ b/js/src/xpconnect/src/xpcconvert.cpp	Tue Oct 13 01:07:56 2009
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
     3
 
@@ -1037,7 +1037,12 @@
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
     4
 
         NS_ADDREF(*dest = objHolder);
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
     5
 
     }
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
     6
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
     7
 
+#ifdef __SUNPRO_CC
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
     8
 
+    // Ugly workaound for a bug of Sun Studio 12. See Bug 478390.
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
     9
 
+    *d = (jsval)obj;
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
    10
 
+#else
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
    11
 
     *d = OBJECT_TO_JSVAL(obj);
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
    12
 
+#endif
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
    13
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
    14
 
     return JS_TRUE;
7620508144e5 2009-12-01 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset 
    15
 
 }
upstream/oracle/spec-files