From 73a6e175cd0f0a27364d3b56b6c9cb2eca16414c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?=
 <valtri@users.sourceforge.net>
Date: Thu, 2 Sep 2004 19:56:40 +0000
Subject: Warnings on WIN32. Compilation fix for CygWin.

CVS patchset: 6932
CVS date: 2004/09/02 19:56:40
---
 src/input/input_cdda.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/input/input_cdda.c')

diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 43c5f98c0..c98830620 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -20,7 +20,7 @@
  * Compact Disc Digital Audio (CDDA) Input Plugin 
  *   by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: input_cdda.c,v 1.64 2004/08/27 19:33:20 valtri Exp $
+ * $Id: input_cdda.c,v 1.65 2004/09/02 19:56:42 valtri Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -861,6 +861,7 @@ static int read_cdrom_frames(cdda_input_plugin_t *this_gen, int frame, int num_f
 #define _BUFSIZ 300
 
 
+#ifndef WIN32
 static int parse_url (char *urlbuf, char** host, int *port) {
   char   *start = NULL;
   char   *portcolon = NULL;
@@ -895,6 +896,7 @@ static int parse_url (char *urlbuf, char** host, int *port) {
 
   return 0;
 }
+#endif
 
 static int network_command( xine_stream_t *stream, int socket, char *data_buf, char *msg, ...)
 {
@@ -1814,10 +1816,9 @@ static void _cdda_free_cddb_info(cdda_input_plugin_t *this) {
 
 static int cdda_open(cdda_input_plugin_t *this_gen,
 					 char *cdda_device, cdrom_toc *toc, int *fdd) {
-
+#ifndef WIN32
   int fd = -1;
 
-#ifndef WIN32
   if ( !cdda_device ) return -1;
  
   *fdd = -1;
@@ -2025,7 +2026,7 @@ static int cdda_close(cdda_input_plugin_t *this_gen) {
   this_gen->h_device_handle = NULL;
   if( this_gen->hASPI )
       FreeLibrary( (HMODULE)this_gen->hASPI );
-  this_gen->hASPI = NULL;
+  this_gen->hASPI = (long)NULL;
 #endif /* WIN32 */
 
   return 0;
-- 
cgit v1.2.3