RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 25-Jul-2007 18:41:30
Branch: HEAD Handle: 2007072517412901
Modified files:
rpm/rpmio rpmdav.h rpmsq.h
Log:
make sure that RPM 5 builds just fine also on platforms where no
Pthreads API exists at all
Summary:
Revision Changes Path
2.16 +2 -0 rpm/rpmio/rpmdav.h
1.10 +2 -0 rpm/rpmio/rpmsq.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmdav.h
============================================================================
$ cvs diff -u -r2.15 -r2.16 rpmdav.h
--- rpm/rpmio/rpmdav.h 29 Jun 2007 20:23:06 -0000 2.15
+++ rpm/rpmio/rpmdav.h 25 Jul 2007 16:41:29 -0000 2.16
@@ -13,7 +13,9 @@
size_t size; /* Total valid data in the block. */
size_t offset; /* Current offset into the block. */
off_t filepos; /* Position of next entry to read. */
+#if defined(HAVE_PTHREAD_H)
pthread_mutex_t lock; /* Mutex lock for this structure. */
+#endif
};
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsq.h
============================================================================
$ cvs diff -u -r1.9 -r1.10 rpmsq.h
--- rpm/rpmio/rpmsq.h 9 Jul 2007 15:38:53 -0000 1.9
+++ rpm/rpmio/rpmsq.h 25 Jul 2007 16:41:30 -0000 1.10
@@ -45,8 +45,10 @@
int pipes[2]; /*!< Parent/child interlock. */
/[EMAIL PROTECTED]@*/
void * id; /*!< Blocking thread id (pthread_t). */
+#if defined(HAVE_PTHREAD_H)
pthread_mutex_t mutex; /*!< Signal delivery to thread condvar. */
pthread_cond_t cond;
+#endif
};
/[EMAIL PROTECTED]@*/
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
