Import of pkgsrc-2015Q2

This commit is contained in:
2015-08-30 02:56:09 -07:00
committed by Lionel Sambuc
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions

View File

@@ -0,0 +1,22 @@
$NetBSD: patch-SrcShared_Hardware_EmRegsUSBVisor.cpp,v 1.1 2015/04/21 17:15:20 joerg Exp $
--- SrcShared/Hardware/EmRegsUSBVisor.cpp.orig 2015-04-17 19:10:12.000000000 +0000
+++ SrcShared/Hardware/EmRegsUSBVisor.cpp
@@ -22,7 +22,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 ())
@@ -31,7 +31,7 @@
#define INSTALL_HANDLER(read, write, reg) \
this->SetHandler ( (ReadFunction) &EmRegsUSBVisor::read, \
(WriteFunction) &EmRegsUSBVisor::write, \
- addressof (reg), \
+ my_addressof (reg), \
fRegs.reg.GetSize ())