[MPlayer-dev-eng] [PATCH] fix compilation of libmpdemux/vcd_read.h on Solaris

[Götz Waschk]

Hi everyone,

this patch fixes the compilation of the vcd demuxer on Solaris. I
couldn't test it as I don't have access to a CD-ROM drive, but the
changes of fd to vcd->fd make sense in that context.

CU
-- 
What difference does it make to the dead, the orphans and the
homeless, whether the mad destruction is wrought under the name of
totalitarianism or the holy name of liberty or democracy?
    Mahatma Gandhi (1869 - 1948), "Non-Violence in Peace and War"
-------------- next part --------------
Index: libmpdemux/vcd_read.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/vcd_read.h,v
retrieving revision 1.13
diff -u -r1.13 vcd_read.h
--- libmpdemux/vcd_read.h	9 Apr 2003 07:33:59 -0000	1.13
+++ libmpdemux/vcd_read.h	16 Jun 2003 14:23:21 -0000
@@ -137,7 +137,7 @@
   cdxa.cdxa_data = vcd->buf;
   cdxa.cdxa_format = CDROM_XA_SECTOR_DATA;
   
-  if(ioctl(fd,CDROMCDXA,&cdxa)==-1) {
+  if(ioctl(vcd->fd,CDROMCDXA,&cdxa)==-1) {
     mp_msg(MSGT_STREAM,MSGL_ERR,"CDROMCDXA: %s\n",strerror(errno));
     return 0;
   }
@@ -148,7 +148,7 @@
   cdread.cdread_bufaddr = vcd->buf;
   cdread.cdread_buflen = 2336;
 
-  if(ioctl(fd,CDROMREADMODE2,&cdread)==-1) {
+  if(ioctl(vcd->fd,CDROMREADMODE2,&cdread)==-1) {
     mp_msg(MSGT_STREAM,MSGL_ERR,"CDROMREADMODE2: %s\n",strerror(errno));
     return 0;
   }
@@ -195,7 +195,7 @@
   sc.uscsi_buflen = 2336;
   sc.uscsi_flags = USCSI_ISOLATE | USCSI_READ;
   sc.uscsi_timeout = 20;
-  if (ioctl(fd, USCSICMD, &sc)) {
+  if (ioctl(vcd->fd, USCSICMD, &sc)) {
       mp_msg(MSGT_STREAM,MSGL_ERR,"USCSICMD: READ CD: %s\n",strerror(errno));
       return -1;
   }