summaryrefslogtreecommitdiff
path: root/rpmio
diff options
context:
space:
mode:
authorjbj <devnull@localhost>1999-07-02 21:15:25 +0000
committerjbj <devnull@localhost>1999-07-02 21:15:25 +0000
commit25643f9764eedaff0769483112bd8b31b17b6ead (patch)
treec71745d01e8122af49371d4ea6ebae0e3dfd5940 /rpmio
parent56496ce0886ebf4ca168387f4fa149b3fd52a6d9 (diff)
downloadlibrpm-tizen-25643f9764eedaff0769483112bd8b31b17b6ead.tar.gz
librpm-tizen-25643f9764eedaff0769483112bd8b31b17b6ead.tar.bz2
librpm-tizen-25643f9764eedaff0769483112bd8b31b17b6ead.zip
Add includes for more robust standalone behavior.
CVS patchset: 3121 CVS date: 1999/07/02 21:15:25
Diffstat (limited to 'rpmio')
-rw-r--r--rpmio/macro.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/rpmio/macro.c b/rpmio/macro.c
index 4206f601d..3776450b0 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -8,6 +8,13 @@
#define FREE(_x) { if (_x) free((void *)_x); (_x) = NULL; }
#ifdef DEBUG_MACROS
+#include <sys/types.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#define rpmError fprintf
#define RPMERR_BADSPEC stderr
#undef _
@@ -517,7 +524,7 @@ static void
pushMacro(MacroEntry **mep, const char *n, const char *o, const char *b, int level)
{
MacroEntry *prev = (*mep ? *mep : NULL);
- MacroEntry *me = malloc(sizeof(*me));
+ MacroEntry *me = (MacroEntry *) malloc(sizeof(*me));
me->prev = prev;
me->name = (prev ? prev->name : strdup(n));
@@ -1400,7 +1407,7 @@ rpmGetPath(const char *path, ...)
#if defined(EVAL_MACROS)
-char *macrofiles = "/usr/lib/rpm/macros:/etc/rpm/macros";
+char *macrofiles = "/usr/lib/rpm/macros:/etc/rpm/macros:~/.rpmmacros";
int
main(int argc, char *argv[])