From beeb609dffdeb0414ca4658911e5dcb4dd8006a9 Mon Sep 17 00:00:00 2001
From: Matt Wilson <msw@redhat.com>
Date: Tue, 30 Nov 1999 22:23:45 +0000
Subject: o   changes needed to use rpmio from rpm HEAD o   typo in exception
 screen o   other things that came along the way.

---
 isys/cpio.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'isys/cpio.h')

diff --git a/isys/cpio.h b/isys/cpio.h
index 44301aee9..2ee92f1ce 100644
--- a/isys/cpio.h
+++ b/isys/cpio.h
@@ -3,7 +3,11 @@
 
 #include <zlib.h>
 #define HAVE_ZLIB_H 1
-#include <rpm/rpmio.h>
+#include <glob.h>   /* XXX rpmlib.h */
+#include <dirent.h> /* XXX rpmlib.h */
+
+#define HAVE_LIBIO 1
+#include <rpmlib.h>
 
 #define CPIO_MAP_PATH           (1 << 0)
 #define CPIO_MAP_MODE           (1 << 1)
@@ -49,9 +53,9 @@ typedef struct CFD {
 typedef void (*cpioCallback)(struct cpioCallbackInfo * filespec, void * data);
 
 /* librpm provides these */
-int cpioInstallArchive(CFD_t *cfd, struct cpioFileMapping * mappings,
-                       int numMappings, cpioCallback cb, void * cbData,
-                       char ** failedFile);
+int cpioInstallArchive(FD_t cfd, struct cpioFileMapping * mappings, 
+		       int numMappings, cpioCallback cb, void * cbData,
+		       const char ** failedFile);
 const char *cpioStrerror(int rc);
 
 int installCpioFile(FD_t fd, char * cpioName, char * outName, int inWin);
-- 
cgit