RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 09-Dec-2010 21:53:41
Branch: rpm-5_3 Handle: 2010120920534001
Modified files: (Branch: rpm-5_3)
rpm/lib rpm4compat.h
rpm/rpmdb rpmdb.h
Log:
drop unnecessary rpmlio.h inclusion to use _RPMDB_INTERNAL in public
API
Summary:
Revision Changes Path
2.30.2.4 +2 -1 rpm/lib/rpm4compat.h
1.140.2.2 +0 -2 rpm/rpmdb/rpmdb.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/rpm4compat.h
============================================================================
$ cvs diff -u -r2.30.2.3 -r2.30.2.4 rpm4compat.h
--- rpm/lib/rpm4compat.h 9 Dec 2010 20:35:18 -0000 2.30.2.3
+++ rpm/lib/rpm4compat.h 9 Dec 2010 20:53:41 -0000 2.30.2.4
@@ -1,7 +1,7 @@
/*
* Copyright © 2008 Per Ãyvind Karlsen <peroyv...@mandriva.org>
*
- * $Id: rpm4compat.h,v 2.30.2.3 2010/12/09 20:35:18 pkarlsen Exp $
+ * $Id: rpm4compat.h,v 2.30.2.4 2010/12/09 20:53:41 pkarlsen Exp $
*/
#ifndef H_RPM4COMPAT
@@ -42,6 +42,7 @@
#include <unistd.h>
#include <stdio.h>
+#define _RPMDB_INTERNAL
#define _RPMTAG_INTERNAL
#define _RPMEVR_INTERNAL
#define _RPMPS_INTERNAL
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.h
============================================================================
$ cvs diff -u -r1.140.2.1 -r1.140.2.2 rpmdb.h
--- rpm/rpmdb/rpmdb.h 9 Oct 2010 21:46:14 -0000 1.140.2.1
+++ rpm/rpmdb/rpmdb.h 9 Dec 2010 20:53:40 -0000 1.140.2.2
@@ -866,8 +866,6 @@
#if defined(_RPMDB_INTERNAL)
-#include <rpmlio.h> /* XXX add to psm.c/fsm.c */
-
#if !defined(__LCLINT__)
/*...@unused@*/ static inline
int rpmlkId(rpmdb rpmdb, uint32_t *_idp)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
