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:39:27
  Branch: HEAD                             Handle: 2008012516392501

  Modified files:
    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.2093      +2  -0      rpm/CHANGES
    2.56        +0  -4      rpm/rpmio/rpmdav.c
    2.63        +0  -4      rpm/rpmio/rpmrpc.c
    1.33        +0  -2      rpm/rpmio/rpmsq.c
    1.13        +0  -4      rpm/rpmio/rpmsq.h
    2.106       +4  -0      rpm/system.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2092 -r1.2093 CHANGES
  --- rpm/CHANGES	25 Jan 2008 15:43:54 -0000	1.2092
  +++ rpm/CHANGES	25 Jan 2008 16:39:25 -0000	1.2093
  @@ -1,4 +1,6 @@
   5.0.0 -> 5.1a1:
  +    - 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.
       - rse: add RPM Lua function rpm.debug() to complement rpm.verbose()
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmdav.c
  ============================================================================
  $ cvs diff -u -r2.55 -r2.56 rpmdav.c
  --- rpm/rpmio/rpmdav.c	24 Jan 2008 22:30:36 -0000	2.55
  +++ rpm/rpmio/rpmdav.c	25 Jan 2008 16:39:26 -0000	2.56
  @@ -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.63 rpmrpc.c
  --- rpm/rpmio/rpmrpc.c	8 Dec 2007 19:30:42 -0000	2.62
  +++ rpm/rpmio/rpmrpc.c	25 Jan 2008 16:39:26 -0000	2.63
  @@ -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.32 -r1.33 rpmsq.c
  --- rpm/rpmio/rpmsq.c	25 Jan 2008 15:43:55 -0000	1.32
  +++ rpm/rpmio/rpmsq.c	25 Jan 2008 16:39:26 -0000	1.33
  @@ -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.13 rpmsq.h
  --- rpm/rpmio/rpmsq.h	8 Nov 2007 20:33:20 -0000	1.12
  +++ rpm/rpmio/rpmsq.h	25 Jan 2008 16:39:26 -0000	1.13
  @@ -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.105 -r2.106 system.h
  --- rpm/system.h	24 Jan 2008 08:35:18 -0000	2.105
  +++ rpm/system.h	25 Jan 2008 16:39:25 -0000	2.106
  @@ -737,6 +737,10 @@
   #define Makedev(x,y)   makedev((x),(y))
   #endif
   
  +#if defined(HAVE_PTHREAD_H) && !defined(__LCLINT__)
  +#include <pthread.h>
  +#endif
  +
   /**
    * Mark --initdb and --verifydb for destruction.
    */
  @@ .