Moved declaration of local_lock out of the #ifdef as reported by Matt Rice.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@18012 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2003-10-30 20:51:44 +00:00
parent 7a61ad790e
commit 9a32828063
2 changed files with 4 additions and 3 deletions

View file

@ -18,7 +18,8 @@
* Source/Additions/GSCompatibility.m: Remove gnustep_global_lock.
* Source/Additions/GSObjCRuntime.m: Remove superfluous locking.
* Source/Additions/Unicode.m: Use new GS_INITIALIZED_LOCK macro
and replace global lock with local lock.
and replace global lock with local lock. Moved out of the #ifdef
as reported by Matt Rice (ratmice@yahoo.com).
* Source/NSLock.m
(-[NSConditionLock lockWhenCondition:beforeDate:]): Implemented.
* Testing/gslock.m: New test case.

View file

@ -83,8 +83,6 @@ typedef struct {unichar from; unsigned char to;} _ucc_;
#define UNICODE_ENC ((unicode_enc) ? unicode_enc : internal_unicode_enc())
static NSRecursiveLock *local_lock = nil;
static const char *unicode_enc = NULL;
/* Check to see what type of internal unicode format the library supports */
@ -124,6 +122,8 @@ internal_unicode_enc(void)
#endif
static NSRecursiveLock *local_lock = nil;
typedef unsigned char unc;
static NSStringEncoding defEnc = GSUndefinedEncoding;
static NSStringEncoding *_availableEncodings = 0;