RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Olivier Thauvin
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 04-Aug-2007 14:20:09
Branch: HEAD Handle: 2007080413200900
Modified files:
rpm/rpmconstant rpmconstant.c rpmconstant.h rpmconstant_internal.c
rpmh2tbl
Log:
- don't force usage of system.h when using rpmconstant.h to avoid
conflict dcl in perl module
Summary:
Revision Changes Path
1.5 +2 -1 rpm/rpmconstant/rpmconstant.c
1.3 +1 -2 rpm/rpmconstant/rpmconstant.h
1.4 +2 -1 rpm/rpmconstant/rpmconstant_internal.c
1.5 +2 -1 rpm/rpmconstant/rpmh2tbl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmconstant/rpmconstant.c
============================================================================
$ cvs diff -u -r1.4 -r1.5 rpmconstant.c
--- rpm/rpmconstant/rpmconstant.c 25 Jul 2007 06:17:29 -0000 1.4
+++ rpm/rpmconstant/rpmconstant.c 4 Aug 2007 12:20:09 -0000 1.5
@@ -1,7 +1,8 @@
/* Nanar <[EMAIL PROTECTED]>
- * $Id: rpmconstant.c,v 1.4 2007/07/25 06:17:29 rse Exp $
+ * $Id: rpmconstant.c,v 1.5 2007/08/04 12:20:09 nanardon Exp $
*/
+#include "system.h"
#define RPMCONSTANT_INTERNAL
#include "rpmconstant.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmconstant/rpmconstant.h
============================================================================
$ cvs diff -u -r1.2 -r1.3 rpmconstant.h
--- rpm/rpmconstant/rpmconstant.h 21 Jul 2007 18:44:18 -0000 1.2
+++ rpm/rpmconstant/rpmconstant.h 4 Aug 2007 12:20:09 -0000 1.3
@@ -1,5 +1,5 @@
/* Nanar <[EMAIL PROTECTED]>
- * $Id: rpmconstant.h,v 1.2 2007/07/21 18:44:18 rse Exp $
+ * $Id: rpmconstant.h,v 1.3 2007/08/04 12:20:09 nanardon Exp $
*/
#ifndef H_RPMCONSTANT
@@ -18,7 +18,6 @@
*
*/
-#include "system.h"
#include <header.h>
#include <rpmio.h>
#include <rpmdb.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmconstant/rpmconstant_internal.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 rpmconstant_internal.c
--- rpm/rpmconstant/rpmconstant_internal.c 25 Jul 2007 06:17:29 -0000
1.3
+++ rpm/rpmconstant/rpmconstant_internal.c 4 Aug 2007 12:20:09 -0000
1.4
@@ -1,7 +1,8 @@
/* Nanar <[EMAIL PROTECTED]>
- * $Id: rpmconstant_internal.c,v 1.3 2007/07/25 06:17:29 rse Exp $
+ * $Id: rpmconstant_internal.c,v 1.4 2007/08/04 12:20:09 nanardon Exp $
*/
+#include "system.h"
#define RPMCONSTANT_INTERNAL
#include "rpmconstant.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmconstant/rpmh2tbl
============================================================================
$ cvs diff -u -r1.4 -r1.5 rpmh2tbl
--- rpm/rpmconstant/rpmh2tbl 22 Jul 2007 00:05:49 -0000 1.4
+++ rpm/rpmconstant/rpmh2tbl 4 Aug 2007 12:20:09 -0000 1.5
@@ -15,7 +15,7 @@
##- along with this program; if not, write to the Free Software
##- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA.
#
-# $Id: rpmh2tbl,v 1.4 2007/07/22 00:05:49 nanardon Exp $
+# $Id: rpmh2tbl,v 1.5 2007/08/04 12:20:09 nanardon Exp $
my @availlabletables;
@@ -181,6 +181,7 @@
* %s
*/
+#include "system.h"
#define RPMCONSTANT_INTERNAL
#include "rpmconstant.h"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
