SOURCES (AC-branch): rpm-rpmsq.patch - merged from HEAD

[baggins]

Author: baggins                      Date: Fri Jun 17 14:41:14 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SOURCES:
   rpm-rpmsq.patch (1.1 -> 1.1.4.1) 

---- Diffs:

================================================================
Index: SOURCES/rpm-rpmsq.patch
diff -u SOURCES/rpm-rpmsq.patch:1.1 SOURCES/rpm-rpmsq.patch:1.1.4.1
--- SOURCES/rpm-rpmsq.patch:1.1	Wed Feb  4 21:22:24 2004
+++ SOURCES/rpm-rpmsq.patch	Fri Jun 17 16:41:09 2005
@@ -1,7 +1,7 @@
 diff -uNr rpm-4.3/rpmio/rpmsq.c rpm-4.3.fixed/rpmio/rpmsq.c
 --- rpm-4.3/rpmio/rpmsq.c	2004-01-04 03:13:09.000000000 +0100
 +++ rpm-4.3.fixed/rpmio/rpmsq.c	2004-02-04 20:29:39.000000000 +0100
-@@ -135,20 +135,20 @@
+@@ -140,20 +140,20 @@
  #define	DO_UNLOCK()	pthread_mutex_unlock(&rpmsigTbl_lock);
  #define	INIT_LOCK()	\
      {	pthread_mutexattr_t attr; \
@@ -19,13 +19,12 @@
  #define	SUB_REF(__tbl)	--(__tbl)->active
  #define	CLEANUP_HANDLER(__handler, __arg, __oldtypeptr) \
 -    (void) pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, (__oldtypeptr));\
-+	pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, (__oldtypeptr));\
++    pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, (__oldtypeptr));\
  	pthread_cleanup_push((__handler), (__arg));
  #define	CLEANUP_RESET(__execute, __oldtype) \
--    (void) pthread_cleanup_pop(__execute); \
+     pthread_cleanup_pop(__execute); \
 -    (void) pthread_setcanceltype ((__oldtype), &(__oldtype));
-+	pthread_cleanup_pop(__execute); \
-+	pthread_setcanceltype ((__oldtype), &(__oldtype));
++    pthread_setcanceltype ((__oldtype), &(__oldtype));
  
  #define	SAME_THREAD(_a, _b)	pthread_equal(((pthread_t)_a), ((pthread_t)_b))
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-rpmsq.patch?r1=1.1&r2=1.1.4.1&f=u