[libdvdcss-devel] [PATCH 11/47] solaris: Drop no use or single use macros
Diego Biurrun <[email protected]>
| Newsgroups | gmane.comp.video.videolan.libdvdcss,gmane.comp.video.videolan.libdvdcss.devel |
|---|---|
| Message-ID | <[email protected]> |
---
src/ioctl.c | 3 +--
src/ioctl.h | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/ioctl.c b/src/ioctl.c
index 81a46c2..e60ed3d 100644
--- a/src/ioctl.c
+++ b/src/ioctl.c
@@ -1579,8 +1579,7 @@ static void SolarisInitUSCSI( struct uscsi_cmd *p_sc, int i_type )
rs_cdb->cdb_opaque[ 8 ] = (p_sc->uscsi_buflen >> 8) & 0xff;
rs_cdb->cdb_opaque[ 9 ] = p_sc->uscsi_buflen & 0xff;
p_sc->uscsi_cdblen = 12;
-
- USCSI_TIMEOUT( p_sc, 15 );
+ p_sc->uscsi_timeout = 15;
}
/*****************************************************************************
diff --git a/src/ioctl.h b/src/ioctl.h
index b01ddcb..ce64153 100644
--- a/src/ioctl.h
+++ b/src/ioctl.h
@@ -57,8 +57,6 @@ int ioctl_ReportRPC ( int, int *, int *, int * );
* Common macro, Solaris specific
*****************************************************************************/
#if defined( SOLARIS_USCSI )
-#define USCSI_TIMEOUT( SC, TO ) ( (SC)->uscsi_timeout = (TO) )
-#define USCSI_RESID( SC ) ( (SC)->uscsi_resid )
#define INIT_USCSI( TYPE, SIZE ) \
struct uscsi_cmd sc = { 0 }; \
union scsi_cdb rs_cdb; \
--
1.9.1
_______________________________________________
libdvdcss-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/libdvdcss-devel