RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 23-Nov-2007 19:35:47
Branch: HEAD Handle: 2007112318354600
Modified files:
rpm CHANGES
rpm/rpmio rpmxar.c rpmxar.h
Log:
- retrofit 3 needed typedef's when compiling w/o HAVE_XAR_H.
Summary:
Revision Changes Path
1.1877 +1 -0 rpm/CHANGES
2.9 +0 -4 rpm/rpmio/rpmxar.c
2.7 +8 -2 rpm/rpmio/rpmxar.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1876 -r1.1877 CHANGES
--- rpm/CHANGES 23 Nov 2007 18:29:01 -0000 1.1876
+++ rpm/CHANGES 23 Nov 2007 18:35:46 -0000 1.1877
@@ -1,4 +1,5 @@
5.0a2 -> 5.0a3:
+ - jbj: retrofit 3 needed typedef's when compiling w/o HAVE_XAR_H.
- jbj: rescusitate txar, pass private buffer through rpmxarPush.
- jbj: re-add rpm2cpio.c.
- jbj: spiffy error msgs for the XAR challenged users.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmxar.c
============================================================================
$ cvs diff -u -r2.8 -r2.9 rpmxar.c
--- rpm/rpmio/rpmxar.c 23 Nov 2007 18:29:02 -0000 2.8
+++ rpm/rpmio/rpmxar.c 23 Nov 2007 18:35:46 -0000 2.9
@@ -1,9 +1,5 @@
#include "system.h"
-#ifdef HAVE_XAR_H
-#include "xar.h"
-#endif
-
#define _RPMXAR_INTERNAL
#include <rpmio_internal.h>
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmxar.h
============================================================================
$ cvs diff -u -r2.6 -r2.7 rpmxar.h
--- rpm/rpmio/rpmxar.h 23 Nov 2007 18:29:02 -0000 2.6
+++ rpm/rpmio/rpmxar.h 23 Nov 2007 18:35:46 -0000 2.7
@@ -12,15 +12,21 @@
typedef /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ struct rpmxar_s * rpmxar;
#ifdef _RPMXAR_INTERNAL
+#if defined(HAVE_XAR_H)
+#include "xar.h"
+#else
+typedef void * xar_t;
+typedef void * xar_file_t;
+typedef void * xar_iter_t;
+#endif
+
struct rpmxar_s {
-#ifdef HAVE_XAR_H
/[EMAIL PROTECTED]@*/
xar_t x;
/[EMAIL PROTECTED]@*/
xar_file_t f;
/[EMAIL PROTECTED]@*/
xar_iter_t i;
-#endif
/[EMAIL PROTECTED]@*/
const char * member; /*!< Current archive member. */
/[EMAIL PROTECTED]@*/
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
