25797620 errors in mozjs-24 build with s12_121 post the fix for 25615141
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Wed, 29 Mar 2017 09:12:26 -0700
changeset 7808 81d1e03a6070
parent 7807 faf888b8f422
child 7809 85e8894d1fc6
25797620 errors in mozjs-24 build with s12_121 post the fix for 25615141
components/desktop/mozjs-24/patches/00-psutil-latest.patch
--- a/components/desktop/mozjs-24/patches/00-psutil-latest.patch	Tue Dec 13 14:33:57 2016 +0100
+++ b/components/desktop/mozjs-24/patches/00-psutil-latest.patch	Wed Mar 29 09:12:26 2017 -0700
@@ -22648,7 +22648,7 @@
 +#endif
 --- mozjs-24.2.0/js/src/python/psutil/psutil/_psutil_sunos.c	1969-12-31 16:00:00.000000000 -0800
 +++ mozjs-24.2.0/js/src/python/psutil/psutil/_psutil_sunos.c	2015-06-17 19:33:33.000000000 -0700
-@@ -0,0 +1,1389 @@
+@@ -0,0 +1,1387 @@
 +/*
 + * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
 + * Use of this source code is governed by a BSD-style license that can be
@@ -23267,9 +23267,7 @@
 +        sprintf(perms, "%c%c%c%c%c%c", p->pr_mflags & MA_READ ? 'r' : '-',
 +                p->pr_mflags & MA_WRITE ? 'w' : '-',
 +                p->pr_mflags & MA_EXEC ? 'x' : '-',
-+                p->pr_mflags & MA_SHARED ? 's' : '-',
-+                p->pr_mflags & MA_NORESERVE ? 'R' : '-',
-+                p->pr_mflags & MA_RESERVED1 ? '*' : ' ');
++                p->pr_mflags & MA_SHARED ? 's' : '-');
 +
 +        // name
 +        if (strlen(p->pr_mapname) > 0) {