diff options
author | mozilla%weilbacher.org <devnull@localhost> | 2007-10-16 18:37:31 +0000 |
---|---|---|
committer | mozilla%weilbacher.org <devnull@localhost> | 2007-10-16 18:37:31 +0000 |
commit | 0e2c23199ce52240bcae2b29df032a21a0656fc1 (patch) | |
tree | 969435d4832fad8044b19358478861751fe0f529 | |
parent | 354c9f727e56280138de7ee4f1ee8260fd966293 (diff) | |
download | nspr-hg-FIREFOX_3_0b1_RELEASE.tar.gz |
[OS/2] Bug 399647: fix OS/2 build break in prlog.c and correct warning, r=wtcNSPR_HEAD_20071016FIREFOX_3_0b2_RELEASEFIREFOX_3_0b2_RC1FIREFOX_3_0b1_RELEASEFIREFOX_3_0b1_RC3FIREFOX_3_0b1_RC2FIREFOX_3_0b1_RC1
-rw-r--r-- | pr/include/md/_os2.h | 9 | ||||
-rw-r--r-- | pr/src/io/prlog.c | 5 | ||||
-rw-r--r-- | pr/src/md/os2/os2cv.c | 9 |
3 files changed, 14 insertions, 9 deletions
diff --git a/pr/include/md/_os2.h b/pr/include/md/_os2.h index c012e32e..f26fc5b7 100644 --- a/pr/include/md/_os2.h +++ b/pr/include/md/_os2.h @@ -394,14 +394,7 @@ extern PRInt32 _MD_Accept(PRFileDesc *fd, PRNetAddr *raddr, PRUint32 *rlen, #define _MD_FREE_LOCK(lock) (DosCloseMutexSem((lock)->mutex)) #define _MD_LOCK(lock) (DosRequestMutexSem((lock)->mutex, SEM_INDEFINITE_WAIT)) #define _MD_TEST_AND_LOCK(lock) (DosRequestMutexSem((lock)->mutex, SEM_INDEFINITE_WAIT),0) -#define _MD_UNLOCK(lock) \ - PR_BEGIN_MACRO \ - if (0 != (lock)->notified.length) { \ - md_UnlockAndPostNotifies((lock), NULL, NULL); \ - } else { \ - DosReleaseMutexSem((lock)->mutex); \ - } \ - PR_END_MACRO +#define _MD_UNLOCK (_PR_MD_UNLOCK) #endif /* --- lock and cv waiting --- */ diff --git a/pr/src/io/prlog.c b/pr/src/io/prlog.c index 935d2add..585bf2d0 100644 --- a/pr/src/io/prlog.c +++ b/pr/src/io/prlog.c @@ -492,7 +492,10 @@ PR_IMPLEMENT(void) PR_LogPrint(const char *fmt, ...) _PUT_LOG(logFile, line_long, nb); /* Ensure there is a trailing newline. */ if (!nb || (line_long[nb-1] != '\n')) { - _PUT_LOG(logFile, "\n", 1); + char eol[2]; + eol[0] = '\n'; + eol[1] = '\0'; + _PUT_LOG(logFile, eol, 1); } _PR_UNLOCK_LOG(); PR_smprintf_free(line_long); diff --git a/pr/src/md/os2/os2cv.c b/pr/src/md/os2/os2cv.c index b9da838e..f0aeefab 100644 --- a/pr/src/md/os2/os2cv.c +++ b/pr/src/md/os2/os2cv.c @@ -430,3 +430,12 @@ _PR_MD_NOTIFYALL_CV(_MDCVar *cv, _MDLock *lock) md_PostNotifyToCvar(cv, lock, PR_TRUE); return; } + +void _PR_MD_UNLOCK(_MDLock *lock) +{ + if (0 != lock->notified.length) { + md_UnlockAndPostNotifies(lock, NULL, NULL); + } else { + DosReleaseMutexSem(lock->mutex); + } +} |