[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2163: adjust define of PTHREAD_RWLOCK_DEFAULT_NP to not conflice with new enum

[Mats Wichmann]

------------------------------------------------------------
revno: 2163
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Mon 2013-09-30 11:27:02 -0600
message:
  adjust define of PTHREAD_RWLOCK_DEFAULT_NP to not conflice with new enum
modified:
  headers/All/4.0/pthread.h.defs
  headers/All/4.1/pthread.h.defs
  headers/All/5.0/pthread.h.defs
  headers/pthread.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/4.0/pthread.h.defs'
--- a/headers/All/4.0/pthread.h.defs	2013-02-07 16:41:47 +0000
+++ b/headers/All/4.0/pthread.h.defs	2013-09-30 17:27:02 +0000
@@ -5,7 +5,6 @@
 #define PTHREAD_MUTEX_RECURSIVE	1
 #define PTHREAD_SCOPE_PROCESS	1
 #define PTHREAD_MUTEX_ERRORCHECK	2
-#define PTHREAD_RWLOCK_DEFAULT_NP	2
 #define __SIZEOF_PTHREAD_BARRIERATTR_T	4
 #define __SIZEOF_PTHREAD_CONDATTR_T	4
 #define __SIZEOF_PTHREAD_MUTEXATTR_T	4

=== modified file 'headers/All/4.1/pthread.h.defs'
--- a/headers/All/4.1/pthread.h.defs	2013-09-28 13:14:54 +0000
+++ b/headers/All/4.1/pthread.h.defs	2013-09-30 17:27:02 +0000
@@ -5,7 +5,6 @@
 #define PTHREAD_MUTEX_RECURSIVE	1
 #define PTHREAD_SCOPE_PROCESS	1
 #define PTHREAD_MUTEX_ERRORCHECK	2
-#define PTHREAD_RWLOCK_DEFAULT_NP	2
 #define __SIZEOF_PTHREAD_BARRIERATTR_T	4
 #define __SIZEOF_PTHREAD_CONDATTR_T	4
 #define __SIZEOF_PTHREAD_MUTEXATTR_T	4

=== modified file 'headers/All/5.0/pthread.h.defs'
--- a/headers/All/5.0/pthread.h.defs	2013-09-28 13:14:54 +0000
+++ b/headers/All/5.0/pthread.h.defs	2013-09-30 17:27:02 +0000
@@ -5,7 +5,6 @@
 #define PTHREAD_MUTEX_RECURSIVE	1
 #define PTHREAD_SCOPE_PROCESS	1
 #define PTHREAD_MUTEX_ERRORCHECK	2
-#define PTHREAD_RWLOCK_DEFAULT_NP	2
 #define __SIZEOF_PTHREAD_BARRIERATTR_T	4
 #define __SIZEOF_PTHREAD_CONDATTR_T	4
 #define __SIZEOF_PTHREAD_MUTEXATTR_T	4

=== modified file 'headers/pthread.h'
--- a/headers/pthread.h	2013-09-28 13:14:54 +0000
+++ b/headers/pthread.h	2013-09-30 17:27:02 +0000
@@ -32,6 +32,7 @@
 #define PTHREAD_MUTEX_RECURSIVE	1
 #define PTHREAD_MUTEX_ERRORCHECK	2
 #if __LSB_VERSION__ < 40
+#define PTHREAD_RWLOCK_DEFAULT_NP	2
 #define PTHREAD_MUTEX_INITIALIZER	\
 	{0,0,0,PTHREAD_MUTEX_NORMAL,__LOCK_INITIALIZER}
 #define PTHREAD_RWLOCK_INITIALIZER	\
@@ -43,10 +44,6 @@
 
 #endif				/* __LSB_VERSION__ >= 1.2 */
 
-#if __LSB_VERSION__ >= 13
-#define PTHREAD_RWLOCK_DEFAULT_NP	2
-#endif				/* __LSB_VERSION__ >= 1.3 */
-
 #if __LSB_VERSION__ >= 20
 #define pthread_cleanup_push(routine,arg)	\
         {struct _pthread_cleanup_buffer _buffer;\

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-09-28 13:14:54 +0000
+++ b/package/Makefile	2013-09-30 17:27:02 +0000
@@ -46,7 +46,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=1
+RPM_PACKAGE_RELEASE=2
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)