]>
Commit | Line | Data |
---|---|---|
ec7b8d8f JB |
1 | --- rpm-5.4.15/rpmio/macro.c.orig 2017-02-20 18:33:02.615449768 +0100 |
2 | +++ rpm-5.4.15/rpmio/macro.c 2017-02-20 19:38:27.348738287 +0100 | |
3 | @@ -102,7 +102,7 @@ | |
4 | #include "debug.h" | |
5 | ||
6 | /*@unchecked@*/ | |
7 | -#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL) | |
8 | +#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL) || defined(WITH_SEMANAGE) | |
9 | static int _globalI = 0x80000000; | |
10 | #endif | |
11 | ||
12 | @@ -866,6 +866,8 @@ | |
13 | return se; | |
14 | } | |
15 | ||
16 | +void delMacroAll(MacroContext mc, const char * n); | |
17 | + | |
18 | /** | |
19 | * Parse (and execute) macro undefinition. | |
20 | * @param mc macro context | |
21 | @@ -1643,7 +1645,7 @@ | |
22 | * @retval *avp invocation args | |
23 | * @return script string | |
24 | */ | |
25 | -#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_JNIEMBED) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_MRUBY_EMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL) | |
26 | +#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_JNIEMBED) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_MRUBY_EMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL) || defined(WITH_SEMANAGE) | |
27 | static char _FIXME_embedded_interpreter_eval_returned_null[] = | |
28 | "FIXME: embedded interpreter eval returned null."; | |
29 | static char * parseEmbedded(const char * s, size_t nb, char *** avp) |