pkgsrc-ng/emulators/qemu0/patches/patch-ioport.c

$NetBSD: patch-ioport.c,v 1.1 2012/06/07 21:35:37 ryoon Exp $

Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>

--- ioport.c.orig	2011-08-08 18:28:42 +0000
+++ ioport.c
@@ -181,7 +181,7 @@ static uint32_t ioport_readb_thunk(void 
     IORange *ioport = opaque;
     uint64_t data;
 
-    ioport->ops->read(ioport, addr - ioport->base, 1, &data);
+    (*ioport->ops->read)(ioport, addr - ioport->base, 1, &data);
     return data;
 }
 
@@ -190,7 +190,7 @@ static uint32_t ioport_readw_thunk(void 
     IORange *ioport = opaque;
     uint64_t data;
 
-    ioport->ops->read(ioport, addr - ioport->base, 2, &data);
+    (*ioport->ops->read)(ioport, addr - ioport->base, 2, &data);
     return data;
 }
 
@@ -199,7 +199,7 @@ static uint32_t ioport_readl_thunk(void 
     IORange *ioport = opaque;
     uint64_t data;
 
-    ioport->ops->read(ioport, addr - ioport->base, 4, &data);
+    (*ioport->ops->read)(ioport, addr - ioport->base, 4, &data);
     return data;
 }