folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add includes for more robust standalone behavior. 

CVS patchset: 3121
CVS date: 1999/07/02 21:15:25
This commit is contained in:
jbj 1999-07-02 21:15:25 +00:00
parent 56496ce088
commit 25643f9764
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/macro.c
View File

@ -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[])

11
rpmio/macro.c
View File

@ -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[])