3 files changed, 9 insertions, 10 deletions
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;
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 2aff36717..9e761f3cd 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_file.c,v 1.95 2004/07/25 17:11:59 mroi Exp $
+ * $Id: input_file.c,v 1.96 2004/09/02 19:56:42 valtri Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -47,7 +47,7 @@
 
 #define MAXFILES      65535
 
-#ifndef _MSC_VER
+#ifndef WIN32
 /* MS needs O_BINARY to open files, for everyone else,
  * make sure it doesn't get in the way */
 #  define O_BINARY  0
diff --git a/src/input/media_helper.c b/src/input/media_helper.c
index d07acbab6..2c61cdb6a 100644
--- a/src/input/media_helper.c
+++ b/src/input/media_helper.c
@@ -51,9 +51,9 @@
 
 #define LOG_MEDIA_EJECT
 
+#ifndef WIN32
 static int media_umount_media(const char *device)
 {
-#ifndef WIN32
   pid_t pid;
   int status;
 
@@ -73,10 +73,8 @@ static int media_umount_media(const char *device)
   } while(1);
   
   return -1;
-#else
-  return 0;
-#endif
 } 
+#endif
 
 int media_eject_media (xine_t *xine, const char *device)
 {