RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm db Date: 20-Mar-2009 14:13:46
Branch: HEAD Handle: 2009032013134600
Modified files:
db/dbinc mutex.h
rpm CHANGES
Log:
- QNX: avoid conflicting db defines for __mutex_lock/__mutex_unlock.
Summary:
Revision Changes Path
1.10 +8 -0 db/dbinc/mutex.h
1.2850 +1 -0 rpm/CHANGES
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: db/dbinc/mutex.h
============================================================================
$ cvs diff -u -r1.9 -r1.10 mutex.h
--- db/dbinc/mutex.h 27 May 2008 11:20:33 -0000 1.9
+++ db/dbinc/mutex.h 20 Mar 2009 13:13:46 -0000 1.10
@@ -83,6 +83,14 @@
#define __mutex_unlock(a, b) __db_fcntl_mutex_unlock(a, b)
#define __mutex_destroy(a, b) __db_fcntl_mutex_destroy(a, b)
#else
+#if defined(__QNXNTO__)
+ #if defined __mutex_lock
+ #undef __mutex_lock
+ #endif
+ #if defined __mutex_unlock
+ #undef __mutex_unlock
+ #endif
+#endif
#define __mutex_init(a, b, c) __db_tas_mutex_init(a, b, c)
#define __mutex_lock(a, b) __db_tas_mutex_lock(a, b)
#define __mutex_unlock(a, b) __db_tas_mutex_unlock(a, b)
@@ .
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2849 -r1.2850 CHANGES
--- rpm/CHANGES 19 Mar 2009 19:49:19 -0000 1.2849
+++ rpm/CHANGES 20 Mar 2009 13:13:46 -0000 1.2850
@@ -1,5 +1,6 @@
5.2a3 -> 5.2a4:
+ - jbj: QNX: avoid conflicting db defines for __mutex_lock/__mutex_unlock.
- jbj: yarn: convert rpmdb refcount to usage mutex.
- jbj: yarn: convert psm refcount to usage mutex.
- jbj: yarn: convert rpmxar refcount to usage mutex.
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
