diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2016-10-24 13:09:38 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2016-10-24 13:09:38 +0300 |
| commit | 5517d26061598fc7917f2ea1873a4beaed34de5e (patch) | |
| tree | df17f137f01d8f2fc1ddbed0b306dbc7be3d0ace /build/parsePrep.c | |
| parent | 34e839b84545b7fc5d876e6194229110ad1568b4 (diff) | |
| download | rpm-5517d26061598fc7917f2ea1873a4beaed34de5e.tar.gz | |
Rename addMacro() and delMacro() to rpmPushMacro() and rpmPopMacro()
These are not deprecated at all no matter what the header has been
saying for the past 15+ years, they're used by rpm itself all over
the place as rpmDefineMacro() serves a slightly different purpose
and there's no rpmUndefineMacro() anyway.
Lets make 'em into proper citizens and move them into rpm namespace,
and while at it, call the operations push and pop since that's much
closer to what actually happens.
Finally, add simple wrapper macros to keep external code compilable
while getting the non-namespaced stuff out of ABI.
Diffstat (limited to 'build/parsePrep.c')
| -rw-r--r-- | build/parsePrep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/parsePrep.c b/build/parsePrep.c index b70aee249..182056ffc 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.c @@ -339,7 +339,7 @@ static int doSetupMacro(rpmSpec spec, const char *line) buildInPlace = 1; spec->buildSubdir = NULL; } - addMacro(spec->macros, "buildsubdir", NULL, spec->buildSubdir, RMIL_SPEC); + rpmPushMacro(spec->macros, "buildsubdir", NULL, spec->buildSubdir, RMIL_SPEC); if (buildInPlace) { rc = RPMRC_OK; goto exit; |