rpmconstant.h   rpmconstant.h 
/* Nanar <nanardon@zarb.org> /* Nanar <nanardon@zarb.org>
* $Id: rpmconstant.h,v 1.7 2008/07/31 00:21:42 jbj Exp $ * $Id: rpmconstant.h,v 1.7.4.1 2010/12/01 22:52:20 pkarlsen Exp $
*/ */
#ifndef H_RPMCONSTANT #ifndef H_RPMCONSTANT
#define H_RPMCONSTANT #define H_RPMCONSTANT
#define PREFIXED_YES 0 #define PREFIXED_YES 0
#define PREFIXED_NO 1 #define PREFIXED_NO 1
#define WITH_PREFIX (1 << 0) #define WITH_PREFIX (1 << 0)
#define WITHOUT_PREFIX (1 << 1) #define WITHOUT_PREFIX (1 << 1)
skipping to change at line 34 skipping to change at line 34
#include <rpmtypes.h> #include <rpmtypes.h>
#include <rpmtag.h> #include <rpmtag.h>
#include <rpmdb.h> #include <rpmdb.h>
#include <rpmts.h> #include <rpmts.h>
#include <rpmte.h> #include <rpmte.h>
#include <rpmps.h> #include <rpmps.h>
#include <rpmds.h> #include <rpmds.h>
#include <rpmfi.h> #include <rpmfi.h>
//#include <misc.h>
#include <rpmbuild.h> #include <rpmbuild.h>
/** /**
* A constant pair name/value * A constant pair name/value
*/ */
typedef /*@abstract@*/ struct rpmconstant_s *rpmconstant; typedef /*@abstract@*/ struct rpmconstant_s *rpmconstant;
/** /**
* A constant list set * A constant list set
*/ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 1 lines changed or added


 rpmdb.h   rpmdb.h 
skipping to change at line 869 skipping to change at line 869
DB_TXN * dbiTxnid(dbiIndex dbi) DB_TXN * dbiTxnid(dbiIndex dbi)
/*@*/ /*@*/
{ {
rpmdb rpmdb = (dbi ? dbi->dbi_rpmdb : NULL); rpmdb rpmdb = (dbi ? dbi->dbi_rpmdb : NULL);
DB_TXN * _txn = (rpmdb ? rpmdb->db_txn : NULL); DB_TXN * _txn = (rpmdb ? rpmdb->db_txn : NULL);
return _txn; return _txn;
} }
#if defined(_RPMDB_INTERNAL) #if defined(_RPMDB_INTERNAL)
#include <rpmlio.h> /* XXX add to psm.c/fsm.c */
#if !defined(__LCLINT__) #if !defined(__LCLINT__)
/*@unused@*/ static inline /*@unused@*/ static inline
int rpmlkId(rpmdb rpmdb, uint32_t *_idp) int rpmlkId(rpmdb rpmdb, uint32_t *_idp)
{ {
DB_ENV * dbenv = rpmdb->db_dbenv; DB_ENV * dbenv = rpmdb->db_dbenv;
int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x080) int rc = (rpmdb->_dbi[0]->dbi_eflags & 0x080)
? dbenv->lock_id(dbenv, _idp) : ENOTSUP; ? dbenv->lock_id(dbenv, _idp) : ENOTSUP;
if (_rpmdb_debug) if (_rpmdb_debug)
fprintf(stderr, "<-- %s(%p,%p) id 0x%x rc %d\n", "dbenv->lock_id", dbenv, _ idp, *_idp, rc); fprintf(stderr, "<-- %s(%p,%p) id 0x%x rc %d\n", "dbenv->lock_id", dbenv, _ idp, *_idp, rc);
return rc; return rc;
 End of changes. 1 change blocks. 
2 lines changed or deleted 0 lines changed or added


 rpmversion.h   rpmversion.h 
skipping to change at line 81 skipping to change at line 81
/* link-time information */ /* link-time information */
extern uint32_t rpmlibVersion(void) extern uint32_t rpmlibVersion(void)
/*@*/; /*@*/;
extern uint32_t rpmlibTimestamp(void) extern uint32_t rpmlibTimestamp(void)
/*@*/; /*@*/;
extern uint32_t rpmlibVendor(void) extern uint32_t rpmlibVendor(void)
/*@*/; /*@*/;
/* compile-time information */ /* compile-time information */
#define RPMLIB_VERSION RPMLIB_VERSION_ENCODE(5,3,r,6,0,_) #define RPMLIB_VERSION RPMLIB_VERSION_ENCODE(5,3,r,7,0,_)
#define RPMLIB_TIMESTAMP RPMLIB_TIMESTAMP_ENCODE(2010,9,18,0,0) #define RPMLIB_TIMESTAMP RPMLIB_TIMESTAMP_ENCODE(2010,12,1,0,0)
#define RPMLIB_VENDOR RPMLIB_VENDOR_ENCODE('R','P','M','5') #define RPMLIB_VENDOR RPMLIB_VENDOR_ENCODE('R','P','M','5')
/* RPM release version encoding */ /* RPM release version encoding */
#define RPMLIB_VERSION_ENCODE(major,minor,type,micro,revision,snap) \ #define RPMLIB_VERSION_ENCODE(major,minor,type,micro,revision,snap) \
( RPMLIB_BITFIELD_SET(31,27,(major)) \ ( RPMLIB_BITFIELD_SET(31,27,(major)) \
| RPMLIB_BITFIELD_SET(26,21,(minor)) \ | RPMLIB_BITFIELD_SET(26,21,(minor)) \
| RPMLIB_BITFIELD_SET(20,18,RPMLIB_VERSION_ENCODE_T(type)) \ | RPMLIB_BITFIELD_SET(20,18,RPMLIB_VERSION_ENCODE_T(type)) \
| RPMLIB_BITFIELD_SET(17,10,(micro)) \ | RPMLIB_BITFIELD_SET(17,10,(micro)) \
| RPMLIB_BITFIELD_SET(9,1,(revision)) \ | RPMLIB_BITFIELD_SET(9,1,(revision)) \
| RPMLIB_BITFIELD_SET(0,0,RPMLIB_VERSION_ENCODE_S(snap))) | RPMLIB_BITFIELD_SET(0,0,RPMLIB_VERSION_ENCODE_S(snap)))
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/