head 1.2; access; symbols pkgsrc-2024Q4:1.1.0.78 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.76 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.74 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.72 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.70 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.68 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.66 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.64 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.62 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.60 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.58 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.56 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.54 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.52 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.50 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.48 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.46 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.44 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.40 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.20 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.42 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.38 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.36 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.34 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.32 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.30 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.28 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.26 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.24 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.22 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.18 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.16 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.14 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.12 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.10 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.8 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.6 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.4 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.2 pkgsrc-2015Q2-base:1.1; locks; strict; comment @// @; 1.2 date 2025.01.31.10.48.26; author micha; state dead; branches; next 1.1; commitid eZz11DvctyWySCHF; 1.1 date 2015.04.21.17.15.20; author joerg; state Exp; branches; next ; commitid GACaLCIvDCjtStiy; desc @@ 1.2 log @emulators/palmosemulator: Remove for FLTK 1.4 transition Part of Step 1. @ text @$NetBSD: patch-SrcShared_Hardware_EmRegsSED1375.cpp,v 1.1 2015/04/21 17:15:20 joerg Exp $ --- SrcShared/Hardware/EmRegsSED1375.cpp.orig 2015-04-17 19:10:12.000000000 +0000 +++ SrcShared/Hardware/EmRegsSED1375.cpp @@@@ -25,7 +25,7 @@@@ // Given a register (specified by its field name), return its address // in emulated space. -#define addressof(reg) \ +#define my_addressof(reg) \ (this->GetAddressStart () + fRegs.offsetof_##reg ()) @@@@ -34,7 +34,7 @@@@ #define INSTALL_HANDLER(read, write, reg) \ this->SetHandler ( (ReadFunction) &EmRegsSED1375::read, \ (WriteFunction) &EmRegsSED1375::write, \ - addressof (reg), \ + my_addressof (reg), \ fRegs.reg.GetSize ()) @@@@ -425,7 +425,7 @@@@ uint32 EmRegsSED1375::lookUpTableDataRea { colorData = (uint8) ((clutEntry & kCLUTBlueMask) << 4); // Get the 4 bits of blue. - address = (emuptr) (addressof (lookUpTableAddress)); + address = (emuptr) (my_addressof (lookUpTableAddress)); EmRegsSED1375::lookUpTableAddressWrite (address, 1, (clutIndex + 1) & 0xFF); } @@@@ -470,7 +470,7 @@@@ void EmRegsSED1375::lookUpTableDataWrite fClutData[clutIndex] &= ~kCLUTBlueMask; // Clear out old red bits. fClutData[clutIndex] |= newColor >> 4; // Save in new blue bits. - address = (emuptr) (addressof (lookUpTableAddress)); + address = (emuptr) (my_addressof (lookUpTableAddress)); EmRegsSED1375::lookUpTableAddressWrite (address, 1, (clutIndex + 1) & 0xFF); } @ 1.1 log @addressof is part of STL, so rename the macro. @ text @d1 1 a1 1 $NetBSD$ @