Index: nspr/pr/include/md/_win95.h |
=================================================================== |
--- nspr/pr/include/md/_win95.h (revision 233722) |
+++ nspr/pr/include/md/_win95.h (working copy) |
@@ -244,7 +244,6 @@ |
#define _MD_UNLOCKFILE _PR_MD_UNLOCKFILE |
/* --- UTF16 IO stuff --- */ |
-extern PRBool _pr_useUnicode; |
#ifdef MOZ_UNICODE |
#define _MD_OPEN_FILE_UTF16 _PR_MD_OPEN_FILE_UTF16 |
#define _MD_OPEN_DIR_UTF16 _PR_MD_OPEN_DIR_UTF16 |
@@ -377,9 +376,9 @@ |
/* --- Lock stuff --- */ |
#define _PR_LOCK _MD_LOCK |
-#define _PR_UNLOCK _MD_UNLOCK |
+#define _PR_UNLOCK _MD_UNLOCK |
-#define _MD_NEW_LOCK(lock) (InitializeCriticalSection(&((lock)->mutex)),(lock)->notified.length=0,(lock)->notified.link=NULL,PR_SUCCESS) |
+#define _MD_NEW_LOCK _PR_MD_NEW_LOCK |
#define _MD_FREE_LOCK(lock) DeleteCriticalSection(&((lock)->mutex)) |
#define _MD_LOCK(lock) EnterCriticalSection(&((lock)->mutex)) |
#define _MD_TEST_AND_LOCK(lock) (EnterCriticalSection(&((lock)->mutex)),0) |
@@ -497,7 +496,7 @@ |
#define _PR_UnlockSched() 0 |
/* --- Initialization stuff --- */ |
-#define _MD_INIT_LOCKS() |
+#define _MD_INIT_LOCKS _PR_MD_INIT_LOCKS |
/* --- Stack stuff --- */ |
#define _MD_INIT_STACK(stack, redzone) |