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:50:06
Branch: HEAD Handle: 2010120920500501
Modified files:
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.34 +2 -1 rpm/lib/rpm4compat.h
1.142 +0 -2 rpm/rpmdb/rpmdb.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/rpm4compat.h
============================================================================
$ cvs diff -u -r2.33 -r2.34 rpm4compat.h
--- rpm/lib/rpm4compat.h 9 Dec 2010 20:08:58 -0000 2.33
+++ rpm/lib/rpm4compat.h 9 Dec 2010 20:50:06 -0000 2.34
@@ -1,7 +1,7 @@
/*
* Copyright © 2008 Per Ãyvind Karlsen <peroyv...@mandriva.org>
*
- * $Id: rpm4compat.h,v 2.33 2010/12/09 20:08:58 pkarlsen Exp $
+ * $Id: rpm4compat.h,v 2.34 2010/12/09 20:50:06 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.141 -r1.142 rpmdb.h
--- rpm/rpmdb/rpmdb.h 9 Oct 2010 01:37:08 -0000 1.141
+++ rpm/rpmdb/rpmdb.h 9 Dec 2010 20:50:05 -0000 1.142
@@ -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
