1.1 --- a/src/import-rpmdb.c	Wed Jan 07 17:59:12 2009 +0000
     1.2 +++ b/src/import-rpmdb.c	Thu Mar 12 20:52:12 2009 +0000
     1.3 @@ -31,8 +31,8 @@
     1.4  	void *p;
     1.5  	char *string;
     1.6  	char **list;
     1.7 -	uint_32 *flags;
     1.8 -	uint_32 integer;
     1.9 +	uint32_t *flags;
    1.10 +	uint32_t integer;
    1.11  };
    1.12  
    1.13  static uint32_t
    1.14 @@ -62,11 +62,11 @@
    1.15  
    1.16  static void
    1.17  add_properties(struct razor_importer *importer,
    1.18 -	       uint32_t type_flags,
    1.19 -	       Header h, int_32 name_tag, int_32 version_tag, int_32 flags_tag)
    1.20 +	       uint32_t type_flags, Header h,
    1.21 +	       int32_t name_tag, int32_t version_tag, int32_t flags_tag)
    1.22  {
    1.23  	union rpm_entry names, versions, flags;
    1.24 -	int_32 i, type, count;
    1.25 +	int32_t i, type, count;
    1.26  
    1.27  	headerGetEntry(h, name_tag, &type, &names.p, &count);
    1.28  	headerGetEntry(h, version_tag, &type, &versions.p, &count);
    1.29 @@ -85,7 +85,7 @@
    1.30  	struct razor_importer *importer;
    1.31  	rpmdbMatchIterator iter;
    1.32  	Header h;
    1.33 -	int_32 type, count, i;
    1.34 +	int32_t type, count, i;
    1.35  	union rpm_entry name, epoch, version, release, arch;
    1.36  	union rpm_entry summary, description, url, license;
    1.37  	union rpm_entry basenames, dirnames, dirindexes;