Make check-programs build again, assorted type-fiddlings..

diff --git a/lib/fs.c b/lib/fs.c
index 05a16dd..9efa651 100644 (file)
--- a/lib/fs.c
+++ b/lib/fs.c
@@ -255,7 +255,7 @@ int rpmGetFilesystemList(const char *** listptr, unsigned int * num)
     return 0;
 }
 
-int rpmGetFilesystemUsage(const char ** fileList, int32_t * fssizes, 
+int rpmGetFilesystemUsage(const char ** fileList, rpm_off_t * fssizes, 
                          unsigned int numFiles,
                          uint32_t ** usagesPtr, int flags)
 {

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 24861f6..babe007 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -257,7 +257,7 @@ int rpmGetFilesystemList( const char *** listptr,
  * @param flags                        (unused)
  * @return                     0 on success, 1 on error
  */
-int rpmGetFilesystemUsage(const char ** fileList, int32_t * fssizes,
+int rpmGetFilesystemUsage(const char ** fileList, rpm_off_t * fssizes,
                unsigned int numFiles, uint32_t ** usagesPtr,
                int flags);
 

diff --git a/lib/tgi.c b/lib/tgi.c
index fb52dd9..289b9c4 100644 (file)
--- a/lib/tgi.c
+++ b/lib/tgi.c
@@ -2,7 +2,7 @@
 
 #include <popt.h>
 
-#include <rpm/rpmtag.h>
+#include <rpm/header.h>
 #include <rpm/rpmgi.h>
 #include <rpm/rpmcli.h>
 #include <rpm/rpmte.h>

diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index dd6fb47..14ee42e 100644 (file)
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -1020,7 +1020,7 @@ fprintf(stderr, "\tFclose(%p)\n", fd);
        Fclose (fd);
     } else {
 if (_rpmts_debug)
-fprintf(stderr, "\t%ld:%ld key %p\n", amount, total, pkgKey);
+fprintf(stderr, "\t%d:%d key %p\n", amount, total, pkgKey);
     }
 
     Py_DECREF(result);

diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c
index 119607e..e0f73e7 100644 (file)
--- a/rpmio/rpmfileutil.c
+++ b/rpmio/rpmfileutil.c
@@ -130,7 +130,7 @@ int rpmDoDigest(pgpHashAlgo algo, const char * fn,int asAscii,
     size_t diglen;
     unsigned char buf[32*BUFSIZ];
     FD_t fd;
-    size_t fsize = 0;
+    rpm_off_t fsize = 0;
     pid_t pid = 0;
     int rc = 0;
     int fdno;

diff --git a/tools/convertdb1.c b/tools/convertdb1.c
index 22e4212..80b9190 100644 (file)
--- a/tools/convertdb1.c
+++ b/tools/convertdb1.c
@@ -7,14 +7,14 @@ const char *__progname;
 #include <string.h>
 #endif
 
-#include <rpm/rpmtag.h>
+#include <rpm/header.h>
 #include <rpm/rpmdb.h>
 #include <rpm/rpmio.h>
 #include <rpm/rpmmacro.h>
 
 #include "lib/legacy.h"
 
-#include "debug.h>
+#include "debug.h"
 
 #define FA_MAGIC      0x02050920
 

diff --git a/tools/rpminject.c b/tools/rpminject.c
index ee15c4f..be19b6f 100644 (file)
--- a/tools/rpminject.c
+++ b/tools/rpminject.c
@@ -4,7 +4,7 @@ const char *__progname;
 #include <err.h>       /* XXX !HAVE_ERR_H: get from misc */
 
 #include <rpm/rpmbuild.h>
-#include <rpm/rpmtag.h>
+#include <rpm/header.h>
 
 #include "lib/rpmlead.h"
 #include "build/buildio.h"