Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > 6a3238430c7845e624bad241e8c14036 > files > 5

kiso-0.8.3-10mdv2009.0.src.rpm

Index: kiso-0.8.3/src/kiso.cpp
===================================================================
--- kiso-0.8.3.orig/src/kiso.cpp
+++ kiso-0.8.3/src/kiso.cpp
@@ -43,6 +43,11 @@
 
 #define DEFAULT_TIMEOUT_MS 10000
 
+#if LIBCDIO_VERSION_NUM < 77
+#define mmc_csb_t scsi_mmc_t
+#define mmc_run_cmd scsi_mmc_run_cmd
+#endif
+
 static const char* const image2_data[] = { 
 "32 32 41 1",
 ". c None",
@@ -3591,14 +3596,14 @@ void Mainform::showdrive()
 
     int i_status; 
     uint8_t buf[500] = { 0, };
-    scsi_mmc_cdb_t cdb = {{0, }};
+    mmc_cdb_t cdb = {{0, }};
 
     CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_GET_CONFIGURATION);
     CDIO_MMC_SET_READ_LENGTH8(cdb.field, sizeof(buf));
     cdb.field[1] = CDIO_MMC_GET_CONF_ALL_FEATURES;
     cdb.field[3] = 0x0;
 
-    i_status = scsi_mmc_run_cmd(p_cdio, 0, &cdb, SCSI_MMC_DATA_READ, sizeof(buf), &buf);
+    i_status = mmc_run_cmd(p_cdio, 0, &cdb, SCSI_MMC_DATA_READ, sizeof(buf), &buf);
     if (i_status == 0) {
       uint8_t *p;
       uint32_t i_data;