RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 10-Jul-2017 11:44:00
Branch: rpm-5_4 Handle: 2017071009440000
Modified files: (Branch: rpm-5_4)
rpm/lib poptALL.c psm.c
Log:
- rpmjss: replace rpmjs with rpmjss.
Summary:
Revision Changes Path
2.144.2.20 +4 -4 rpm/lib/poptALL.c
2.399.2.29 +2 -2 rpm/lib/psm.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/poptALL.c
============================================================================
$ cvs diff -u -r2.144.2.19 -r2.144.2.20 poptALL.c
--- rpm/lib/poptALL.c 20 May 2017 19:21:07 -0000 2.144.2.19
+++ rpm/lib/poptALL.c 10 Jul 2017 09:44:00 -0000 2.144.2.20
@@ -25,7 +25,7 @@
#include <poptIO.h>
#include <rpmjni.h>
-#include <rpmjs.h>
+#include <rpmjss.h>
#include <rpmruby.h>
#include <rpmtag.h>
@@ -451,7 +451,7 @@
rpmcliFini(poptContext optCon)
{
extern rpmioPool _rpmjniPool;
- extern rpmioPool _rpmjsPool;
+ extern rpmioPool _rpmjssPool;
extern rpmioPool _headerPool;
extern const char * evr_tuple_order;
extern const char * evr_tuple_match;
@@ -468,8 +468,8 @@
/* Realease (and dereference) embedded interpreter global objects first.
*/
_rpmjniI = rpmjniFree(_rpmjniI);
_rpmjniPool = rpmioFreePool(_rpmjniPool);
- _rpmjsI = rpmjsFree(_rpmjsI);
- _rpmjsPool = rpmioFreePool(_rpmjsPool);
+ _rpmjssI = rpmjssFree(_rpmjssI);
+ _rpmjssPool = rpmioFreePool(_rpmjssPool);
RPMIOPOOL_INTERP_FREE(ruby)
RPMIOPOOL_INTERP_FREE(mdb)
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.399.2.28 -r2.399.2.29 psm.c
--- rpm/lib/psm.c 1 Jun 2017 18:38:24 -0000 2.399.2.28
+++ rpm/lib/psm.c 10 Jul 2017 09:44:00 -0000 2.399.2.29
@@ -16,7 +16,7 @@
#include <rpmaug.h>
#include <rpmficl.h>
#include <rpmjni.h>
-#include <rpmjs.h>
+#include <rpmjss.h>
#include <rpmlua.h>
#include <rpmmrb.h>
#include <rpmperl.h>
@@ -645,7 +645,7 @@
#endif
#if defined(WITH_MOZJS)
if (!strcmp(Phe->p.argv[0], "<js>")) {
- RPMIOPOOL_INTERP_RUN(js)
+ RPMIOPOOL_INTERP_RUN(jss)
} else
#endif
#if defined(WITH_MRBEMBED)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
