RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 09-Oct-2008 13:15:45
Branch: HEAD Handle: 2008100911154500
Modified files:
rpm CHANGES
rpm/lib rpm4compat.h
Log:
define all _RPM*_INTERNALs before inclusion of any rpm headers at all in
rpm4compat.h to ensure that these actually has any effect
Summary:
Revision Changes Path
1.2588 +2 -0 rpm/CHANGES
2.17 +5 -4 rpm/lib/rpm4compat.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2587 -r1.2588 CHANGES
--- rpm/CHANGES 7 Oct 2008 20:49:52 -0000 1.2587
+++ rpm/CHANGES 9 Oct 2008 11:15:45 -0000 1.2588
@@ -1,5 +1,7 @@
5.1.0 -> 5.2a0:
+ - proyvind: define all _RPM*_INTERNALs before inclusion of any rpm
headers
+ at all in rpm4compat.h to ensure that these actually has any effect.
- jbj: print last problem added w platform affinity failure.
- jbj: lazily create ts problem set.
- jbj: selinux: resurrect lsetfilecon using libselinux API.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpm4compat.h
============================================================================
$ cvs diff -u -r2.16 -r2.17 rpm4compat.h
--- rpm/lib/rpm4compat.h 16 Sep 2008 13:55:15 -0000 2.16
+++ rpm/lib/rpm4compat.h 9 Oct 2008 11:15:45 -0000 2.17
@@ -1,7 +1,7 @@
/*
* Copyright © 2008 Per Øyvind Karlsen <[EMAIL PROTECTED]>
*
- * $Id: rpm4compat.h,v 2.16 2008/09/16 13:55:15 pkarlsen Exp $
+ * $Id: rpm4compat.h,v 2.17 2008/10/09 11:15:45 pkarlsen Exp $
*/
#ifndef H_RPM4COMPAT
@@ -38,6 +38,10 @@
#include <unistd.h>
#include <stdio.h>
+#define _RPMTAG_INTERNAL
+#define _RPMEVR_INTERNAL
+#define _RPMPS_INTERNAL
+
#include <rpm/rpmio.h>
#include <rpm/rpmcb.h>
#include <rpm/rpmiotypes.h>
@@ -45,14 +49,11 @@
#include <rpm/rpmpgp.h>
#include <rpm/rpmtypes.h>
-#define _RPMTAG_INTERNAL
#include <rpm/rpmtag.h>
-#define _RPMEVR_INTERNAL
#include <rpm/rpmevr.h>
#include <rpm/pkgio.h>
#include <rpm/rpmds.h>
-#define _RPMPS_INTERNAL
#include <rpm/rpmts.h>
#include <rpm/rpmcli.h>
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
