|
 |
d3d32cf |
commit 7987b0332e6b660ac7992176daeede40cab98390
|
|
|
d3d32cf |
Author: Nils Philippsen <nils@redhat.com>
|
|
|
d3d32cf |
Date: Tue Jun 16 17:02:49 2009 +0200
|
|
|
d3d32cf |
|
|
|
d3d32cf |
patch: open-macro
|
|
|
d3d32cf |
|
|
|
d3d32cf |
Squashed commit of the following:
|
|
|
d3d32cf |
|
|
|
d3d32cf |
commit ab8fe801c4f82017988cb44cb79d82d286aa0de4
|
|
|
d3d32cf |
Author: Nils Philippsen <nils@redhat.com>
|
|
|
d3d32cf |
Date: Tue Jun 9 17:57:45 2009 +0200
|
|
|
d3d32cf |
|
|
|
d3d32cf |
don't inadvertently use glibc open() macro
|
|
|
d3d32cf |
|
|
|
d3d32cf |
diff --git a/backend/mustek_pp.c b/backend/mustek_pp.c
|
|
|
d3d32cf |
index 8c3f06a..7e9d094 100644
|
|
|
d3d32cf |
--- a/backend/mustek_pp.c
|
|
|
d3d32cf |
+++ b/backend/mustek_pp.c
|
|
|
d3d32cf |
@@ -1152,7 +1152,7 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
|
|
|
d3d32cf |
|
|
|
d3d32cf |
}
|
|
|
d3d32cf |
|
|
|
d3d32cf |
- if ((status = dev->func->open (dev->port, dev->caps, &fd)) != SANE_STATUS_GOOD) {
|
|
|
d3d32cf |
+ if ((status = (dev->func->open) (dev->port, dev->caps, &fd)) != SANE_STATUS_GOOD) {
|
|
|
d3d32cf |
|
|
|
d3d32cf |
DBG (1, "sane_open: could not open device (%s)\n",
|
|
|
d3d32cf |
sane_strstatus (status));
|
|
|
d3d32cf |
diff --git a/backend/pixma_common.c b/backend/pixma_common.c
|
|
|
d3d32cf |
index 2bcb3c1..c5e1e96 100644
|
|
|
d3d32cf |
--- a/backend/pixma_common.c
|
|
|
d3d32cf |
+++ b/backend/pixma_common.c
|
|
|
d3d32cf |
@@ -511,7 +511,7 @@ pixma_open (unsigned devnr, pixma_t ** handle)
|
|
|
d3d32cf |
strncpy (s->id, pixma_get_device_id (devnr), sizeof (s->id) - 1);
|
|
|
d3d32cf |
s->ops = s->cfg->ops;
|
|
|
d3d32cf |
s->scanning = 0;
|
|
|
d3d32cf |
- error = s->ops->open (s);
|
|
|
d3d32cf |
+ error = (s->ops->open) (s);
|
|
|
d3d32cf |
if (error < 0)
|
|
|
d3d32cf |
goto rollback;
|
|
|
d3d32cf |
error = pixma_deactivate (s->io);
|
|
|
d3d32cf |
diff --git a/backend/plustek_pp.c b/backend/plustek_pp.c
|
|
|
d3d32cf |
index 13d1443..629e238 100644
|
|
|
d3d32cf |
--- a/backend/plustek_pp.c
|
|
|
d3d32cf |
+++ b/backend/plustek_pp.c
|
|
|
d3d32cf |
@@ -258,7 +258,7 @@ static int drvopen( Plustek_Device *dev )
|
|
|
d3d32cf |
|
|
|
d3d32cf |
DBG( _DBG_INFO, "drvopen()\n" );
|
|
|
d3d32cf |
|
|
|
d3d32cf |
- handle = dev->open((const char*)dev->name, (void *)dev );
|
|
|
d3d32cf |
+ handle = (dev->open)((const char*)dev->name, (void *)dev );
|
|
|
d3d32cf |
|
|
|
d3d32cf |
tsecs = 0;
|
|
|
d3d32cf |
|
|
|
d3d32cf |
diff --git a/sanei/sanei_scsi.c b/sanei/sanei_scsi.c
|
|
|
d3d32cf |
index 69d5859..a594aba 100644
|
|
|
d3d32cf |
--- a/sanei/sanei_scsi.c
|
|
|
d3d32cf |
+++ b/sanei/sanei_scsi.c
|
|
|
d3d32cf |
@@ -5328,7 +5328,7 @@ sanei_scsi_find_devices (const char *findvendor, const char *findmodel,
|
|
|
d3d32cf |
(*plugInInterface)->Release (plugInInterface);
|
|
|
d3d32cf |
IOObjectRelease (scsiDevice);
|
|
|
d3d32cf |
|
|
|
d3d32cf |
- ioReturnValue = (*scsiDeviceInterface)->open (scsiDeviceInterface);
|
|
|
d3d32cf |
+ ioReturnValue = ((*scsiDeviceInterface)->open) (scsiDeviceInterface);
|
|
|
d3d32cf |
if (ioReturnValue != kIOReturnSuccess)
|
|
|
d3d32cf |
{
|
|
|
d3d32cf |
DBG (5, "Error opening SCSI interface (0x%08x)\n", ioReturnValue);
|