RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   25-Jan-2008 17:46:01
  Branch: rpm-5_0                          Handle: 2008012516460001

  Modified files:           (Branch: rpm-5_0)
    rpm                     CHANGES system.h
    rpm/rpmio               rpmdav.c rpmrpc.c rpmsq.c rpmsq.h

  Log:
    - jbj: include <pthread.h> everywhere.
    - jbj: rpmsq.h doesn't need pthread condvar/mutex any more.

  Summary:
    Revision    Changes     Path
    1.2054.2.18 +2  -0      rpm/CHANGES
    2.54.2.2    +0  -4      rpm/rpmio/rpmdav.c
    2.62.2.1    +0  -4      rpm/rpmio/rpmrpc.c
    1.31.2.2    +0  -2      rpm/rpmio/rpmsq.c
    1.12.2.1    +0  -4      rpm/rpmio/rpmsq.h
    2.104.2.1   +4  -0      rpm/system.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2054.2.17 -r1.2054.2.18 CHANGES
  --- rpm/CHANGES	25 Jan 2008 15:44:42 -0000	1.2054.2.17
  +++ rpm/CHANGES	25 Jan 2008 16:46:00 -0000	1.2054.2.18
  @@ -1,4 +1,6 @@
   5.0.0 -> 5.0.1:
  +    - jbj: include <pthread.h> everywhere.
  +    - jbj: rpmsq.h doesn't need pthread condvar/mutex any more.
       - jbj: QNX does not have insque/remque.
       - jbj: QNX does not have d_off.
       - jbj: proof-of-concept rpmbuild --lsb implementation.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmdav.c
  ============================================================================
  $ cvs diff -u -r2.54.2.1 -r2.54.2.2 rpmdav.c
  --- rpm/rpmio/rpmdav.c	24 Jan 2008 22:31:56 -0000	2.54.2.1
  +++ rpm/rpmio/rpmdav.c	25 Jan 2008 16:46:00 -0000	2.54.2.2
  @@ -5,10 +5,6 @@
   
   #include "system.h"
   
  -#if defined(HAVE_PTHREAD_H) && !defined(__LCLINT__)
  -#include <pthread.h>
  -#endif
  -
   #ifdef WITH_NEON
   
   #include "ne_alloc.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmrpc.c
  ============================================================================
  $ cvs diff -u -r2.62 -r2.62.2.1 rpmrpc.c
  --- rpm/rpmio/rpmrpc.c	8 Dec 2007 19:30:42 -0000	2.62
  +++ rpm/rpmio/rpmrpc.c	25 Jan 2008 16:46:00 -0000	2.62.2.1
  @@ -4,10 +4,6 @@
   
   #include "system.h"
   
  -#if defined(HAVE_PTHREAD_H) && !defined(__LCLINT__)
  -#include <pthread.h>
  -#endif
  -
   #include "rpmio_internal.h"
   #include "rpmmacro.h"
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsq.c
  ============================================================================
  $ cvs diff -u -r1.31.2.1 -r1.31.2.2 rpmsq.c
  --- rpm/rpmio/rpmsq.c	25 Jan 2008 15:44:42 -0000	1.31.2.1
  +++ rpm/rpmio/rpmsq.c	25 Jan 2008 16:46:01 -0000	1.31.2.2
  @@ -192,8 +192,6 @@
   
   #if defined(HAVE_PTHREAD_H)
   
  -#include <pthread.h>
  -
   # if !defined(__QNX__)
   /* XXX suggested in bugzilla #159024 */
   #if PTHREAD_MUTEX_DEFAULT != PTHREAD_MUTEX_NORMAL
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsq.h
  ============================================================================
  $ cvs diff -u -r1.12 -r1.12.2.1 rpmsq.h
  --- rpm/rpmio/rpmsq.h	8 Nov 2007 20:33:20 -0000	1.12
  +++ rpm/rpmio/rpmsq.h	25 Jan 2008 16:46:01 -0000	1.12.2.1
  @@ -46,10 +46,6 @@
       int pipes[2];		/*!< Parent/child interlock. */
   /*@shared@*/
       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
   };
   #endif
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/system.h
  ============================================================================
  $ cvs diff -u -r2.104 -r2.104.2.1 system.h
  --- rpm/system.h	16 Dec 2007 17:39:19 -0000	2.104
  +++ rpm/system.h	25 Jan 2008 16:46:00 -0000	2.104.2.1
  @@ -725,6 +725,10 @@
   #include <search.h>
   #endif
   
  +#if defined(HAVE_PTHREAD_H) && !defined(__LCLINT__)
  +#include <pthread.h>
  +#endif
  +
   /**
    * Mark --initdb and --verifydb for destruction.
    */
  @@ .