File nspr-threads.patch of Package mingw64-mozilla-nspr

Overview Repositories Revisions Requests Users Attributes Meta

File nspr-threads.patch of Package mingw64-mozilla-nspr (Revision 6443ca7b17bf1ddb64901224bbe3fcb5)

Currently displaying revision 6443ca7b17bf1ddb64901224bbe3fcb5 , Show latest

--- pr/src/md/windows/ntdllmn.c
+++ pr/src/md/windows/ntdllmn.c
@@ -71,15 +71,23 @@
 
     switch (fdwReason) {
         case DLL_PROCESS_ATTACH:
+#ifdef _MSC_VER
             /*
              * If lpvReserved is NULL, we are dynamically loaded
              * and therefore can't use static thread-local storage.
              */
             if (lpvReserved == NULL) {
                 _pr_use_static_tls = FALSE;
             } else {
                 _pr_use_static_tls = TRUE;
             }
+#else
+            /* 
+             * No __declspec(thread) on mingw, so just use
+             * the Tls* API always.
+             */
+            _pr_use_static_tls = FALSE;
+#endif
             break;
         case DLL_THREAD_ATTACH:
             break;
--- pr/src/io/prmapopt.c
+++ pr/src/io/prmapopt.c
@@ -231,8 +231,6 @@
     if (PR_SockOpt_Nonblocking == data->option)
     {
 #ifdef WINNT
-        PR_ASSERT((fd->secret->md.io_model_committed == PR_FALSE)
-            || (fd->secret->nonblocking == data->value.non_blocking));
         if (fd->secret->md.io_model_committed
             && (fd->secret->nonblocking != data->value.non_blocking))
         {

Places

File nspr-threads.patch of Package mingw64-mozilla-nspr (Revision 6443ca7b17bf1ddb64901224bbe3fcb5)

Places