← Back to branch summary

~ubuntu-branches/ubuntu/karmic/nss/karmic

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/util/nssrwlk.h

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack, Fabien Tassin, Alexander Sack
  • Date: 2009-01-11 15:06:17 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090111150617-iz4lw05qgy2odorl
Tags: 3.12.2~rc1-0ubuntu1
* New upstream snapshot: 3.12.2 RC1

[ Fabien Tassin <fta@ubuntu.com> ]
* Remove patch applied upstream:
  - drop debian/patches/80_security_tools.patch
  - update debian/patches/series
* Update diverged patches:
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
* Add new symbols to symbols file
  - update debian/libnss3-1d.symbols

[ Alexander Sack <asac@ubuntu.com> ]
* disable soname patch to become binary compatible with upstream
  - update debian/patches/series
* flip links: libnss3.so <- libnss3.so.1d (before: libnss3.so ->
  libnss3.so.1d); same link flipping was done for all other previously
  soname patched libs: libnssutil3.so, libsmime3.so.1d, libssl3.so.1d
  - update debian/libnss3-1d.links
  - update debian/libnss3-1d.symbols
* properly transition links in preinst and postrm; also cover abort-
  cases in the other maintainer scripts
  - add debian/libnss3-1d.postinst
  - add debian/libnss3-1d.postrm
  - add debian/libnss3-1d.preinst
  - add debian/libnss3-1d.prerm
* remove hack from debian/rules that debian uses to recreate
  libsoftokn3.so with a versioned SONAME
  - update debian/rules
* install the unversioned .so binaries
  - update debian/rules
* only install the 4 main libraries into /usr/lib; all the others
  go to pkglibdir
  - update debian/rules
* higher bar for libnspr4 Build-Depend to >= 4.7.3~, which is
  the version where the soname droppage is going to happen
  - update debian/control
* explitily pass libraries to be used for dpkg-gensymbols run of
  dh_makeshlibs
  - update debian/rules
* fix lintian complain about no-shlibs-control-file
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/util/nssrwlk.h
74
74
**   is returned.
75
75
**  
76
76
***********************************************************************/
77
 
PR_EXTERN(NSSRWLock*) NSSRWLock_New(PRUint32 lock_rank, const char *lock_name);
 
77
extern NSSRWLock* NSSRWLock_New(PRUint32 lock_rank, const char *lock_name);
78
78
 
79
79
/***********************************************************************
80
80
** FUNCTION:    NSSRWLock_AtomicCreate
92
92
**   the pointer will be left NULL.
93
93
**  
94
94
***********************************************************************/
95
 
PR_EXTERN(NSSRWLock *)
 
95
extern NSSRWLock *
96
96
nssRWLock_AtomicCreate( NSSRWLock  ** prwlock, 
97
97
                        PRUint32      lock_rank, 
98
98
                        const char *  lock_name);
105
105
** OUTPUTS:     void
106
106
** RETURN:      None
107
107
***********************************************************************/
108
 
PR_EXTERN(void) NSSRWLock_Destroy(NSSRWLock *lock);
 
108
extern void NSSRWLock_Destroy(NSSRWLock *lock);
109
109
 
110
110
/***********************************************************************
111
111
** FUNCTION:    NSSRWLock_LockRead
115
115
** OUTPUTS:     void
116
116
** RETURN:      None
117
117
***********************************************************************/
118
 
PR_EXTERN(void) NSSRWLock_LockRead(NSSRWLock *lock);
 
118
extern void NSSRWLock_LockRead(NSSRWLock *lock);
119
119
 
120
120
/***********************************************************************
121
121
** FUNCTION:    NSSRWLock_LockWrite
125
125
** OUTPUTS:     void
126
126
** RETURN:      None
127
127
***********************************************************************/
128
 
PR_EXTERN(void) NSSRWLock_LockWrite(NSSRWLock *lock);
 
128
extern void NSSRWLock_LockWrite(NSSRWLock *lock);
129
129
 
130
130
/***********************************************************************
131
131
** FUNCTION:    NSSRWLock_UnlockRead
135
135
** OUTPUTS:     void
136
136
** RETURN:      void
137
137
***********************************************************************/
138
 
PR_EXTERN(void) NSSRWLock_UnlockRead(NSSRWLock *lock);
 
138
extern void NSSRWLock_UnlockRead(NSSRWLock *lock);
139
139
 
140
140
/***********************************************************************
141
141
** FUNCTION:    NSSRWLock_UnlockWrite
145
145
** OUTPUTS:     void
146
146
** RETURN:      void
147
147
***********************************************************************/
148
 
PR_EXTERN(void) NSSRWLock_UnlockWrite(NSSRWLock *lock);
 
148
extern void NSSRWLock_UnlockWrite(NSSRWLock *lock);
149
149
 
150
150
/***********************************************************************
151
151
** FUNCTION:    NSSRWLock_HaveWriteLock
156
156
** RETURN:      PRBool  PR_TRUE IFF the current thread holds the write lock.
157
157
***********************************************************************/
158
158
 
159
 
PR_EXTERN(PRBool) NSSRWLock_HaveWriteLock(NSSRWLock *rwlock);
 
159
extern PRBool NSSRWLock_HaveWriteLock(NSSRWLock *rwlock);
160
160
 
161
161
/* SEC_END_PROTOS */
162
162
PR_END_EXTERN_C