head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.40
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.38
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.36
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.34
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.32
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.30
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.28
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.26
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.24
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.22
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.20
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.18
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.16
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.14
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.12
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.10
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.8
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.6
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.4
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.2
	pkgsrc-2021Q2-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2021.06.16.22.21.12;	author nia;	state Exp;
branches;
next	;
commitid	NoYVNA2jhbHmjpXC;


desc
@@


1.1
log
@firefox52: fix compatibility with newer NSS
@
text
@$NetBSD$

Avoid macro conflict with NSS 3.66
https://bugzilla.mozilla.org/show_bug.cgi?id=1714311

--- dom/indexedDB/IDBDatabase.cpp.orig	2017-04-11 02:13:20.000000000 +0000
+++ dom/indexedDB/IDBDatabase.cpp
@@@@ -668,7 +668,7 @@@@ IDBDatabase::Transaction(JSContext* aCx,
       break;
     case IDBTransactionMode::Readwrite:
       if (mQuotaExceeded) {
-        mode = IDBTransaction::CLEANUP;
+        mode = IDBTransaction::TRANSACTION_CLEANUP;
         mQuotaExceeded = false;
       } else {
         mode = IDBTransaction::READ_WRITE;
@@@@ -678,7 +678,7 @@@@ IDBDatabase::Transaction(JSContext* aCx,
       mode = IDBTransaction::READ_WRITE_FLUSH;
       break;
     case IDBTransactionMode::Cleanup:
-      mode = IDBTransaction::CLEANUP;
+      mode = IDBTransaction::TRANSACTION_CLEANUP;
       mQuotaExceeded = false;
       break;
     case IDBTransactionMode::Versionchange:
@@@@ -713,7 +713,7 @@@@ IDBDatabase::Transaction(JSContext* aCx,
 
   transaction->SetBackgroundActor(actor);
 
-  if (mode == IDBTransaction::CLEANUP) {
+  if (mode == IDBTransaction::TRANSACTION_CLEANUP) {
     ExpireFileActors(/* aExpireAll */ true);
   }
 
@@@@ -863,7 +863,7 @@@@ IDBDatabase::AbortTransactions(bool aSho
             // We warn for any transactions that could have written data.
             case IDBTransaction::READ_WRITE:
             case IDBTransaction::READ_WRITE_FLUSH:
-            case IDBTransaction::CLEANUP:
+            case IDBTransaction::TRANSACTION_CLEANUP:
             case IDBTransaction::VERSION_CHANGE:
               transactionsThatNeedWarning.AppendElement(transaction);
               break;
@