rpms/xulrunner/devel mozilla-build-sbrk.patch,1.2,1.3

Martin Stransky stransky at fedoraproject.org
Wed Jan 13 21:35:10 UTC 2010


Author: stransky

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21066

Modified Files:
	mozilla-build-sbrk.patch 
Log Message:
Build fix

mozilla-build-sbrk.patch:
 shell/js.cpp                 |    2 +-
 xpconnect/shell/xpcshell.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: mozilla-build-sbrk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/mozilla-build-sbrk.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mozilla-build-sbrk.patch	13 Jan 2010 20:56:51 -0000	1.2
+++ mozilla-build-sbrk.patch	13 Jan 2010 21:35:10 -0000	1.3
@@ -1,5 +1,6 @@
---- mozilla-1.9.2/js/src/shell/js.cpp.sbrk	2010-01-06 04:35:17.000000000 +0100
-+++ mozilla-1.9.2/js/src/shell/js.cpp	2010-01-13 21:47:40.000000000 +0100
+diff -up xulrunner-1.9.2.1/mozilla-1.9.2/js/src/shell/js.cpp.sbrk xulrunner-1.9.2.1/mozilla-1.9.2/js/src/shell/js.cpp
+--- xulrunner-1.9.2.1/mozilla-1.9.2/js/src/shell/js.cpp.sbrk	2010-01-06 04:35:17.000000000 +0100
++++ xulrunner-1.9.2.1/mozilla-1.9.2/js/src/shell/js.cpp	2010-01-13 21:49:33.000000000 +0100
 @@ -1119,7 +1119,7 @@ GC(JSContext *cx, uintN argc, jsval *vp)
      char buf[256];
      JS_snprintf(buf, sizeof(buf), "before %lu, after %lu, break %08lx\n",
@@ -9,3 +10,15 @@
                  (unsigned long)sbrk(0)
  #else
                  0
+diff -up xulrunner-1.9.2.1/mozilla-1.9.2/js/src/xpconnect/shell/xpcshell.cpp.sbrk xulrunner-1.9.2.1/mozilla-1.9.2/js/src/xpconnect/shell/xpcshell.cpp
+--- xulrunner-1.9.2.1/mozilla-1.9.2/js/src/xpconnect/shell/xpcshell.cpp.sbrk	2010-01-06 04:35:19.000000000 +0100
++++ xulrunner-1.9.2.1/mozilla-1.9.2/js/src/xpconnect/shell/xpcshell.cpp	2010-01-13 22:32:46.000000000 +0100
+@@ -543,7 +543,7 @@ GC(JSContext *cx, JSObject *obj, uintN a
+     JS_GC(cx);
+     fprintf(gOutFile, "before %lu, after %lu, break %08lx\n",
+            (unsigned long)preBytes, (unsigned long)rt->gcBytes,
+-#if defined(XP_UNIX) && !defined(__SYMBIAN32__)
++#if 0 //defined(XP_UNIX) && !defined(__SYMBIAN32__)
+            (unsigned long)sbrk(0)
+ #else
+            0



More information about the scm-commits mailing list