From 2e91ef8ab50ae2c74dc3c84a90638f84c61b1b74 Mon Sep 17 00:00:00 2001 From: rocky Date: Tue, 8 Mar 2005 03:19:29 +0000 Subject: [PATCH] Need to make close_tray_win32 external even when not on Windows. --- lib/driver/MSWindows/win32.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/driver/MSWindows/win32.c b/lib/driver/MSWindows/win32.c index db1ed25f..846d558c 100644 --- a/lib/driver/MSWindows/win32.c +++ b/lib/driver/MSWindows/win32.c @@ -1,5 +1,5 @@ /* - $Id: win32.c,v 1.26 2005/03/08 03:11:19 rocky Exp $ + $Id: win32.c,v 1.27 2005/03/08 03:19:29 rocky Exp $ Copyright (C) 2003, 2004, 2005 Rocky Bernstein @@ -26,7 +26,7 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: win32.c,v 1.26 2005/03/08 03:11:19 rocky Exp $"; +static const char _rcsid[] = "$Id: win32.c,v 1.27 2005/03/08 03:19:29 rocky Exp $"; #include #include @@ -542,16 +542,6 @@ read_toc_win32 (void *p_user_data) return ret; } -driver_return_code_t -close_tray_win32 ( const char *psz_win32_drive) -{ - if ( WIN_NT ) { - return close_tray_win32ioctl (psz_win32_drive); - } else { - return DRIVER_OP_UNSUPPORTED; /* not yet, but soon I hope */ - } -} - /*! Eject media. Return 1 if successful, 0 otherwise. */ @@ -810,6 +800,20 @@ cdio_is_device_win32(const char *source_name) #endif } +driver_return_code_t +close_tray_win32 ( const char *psz_win32_drive) +{ +#ifdef HAVE_WIN32_CDROM + if ( WIN_NT ) { + return close_tray_win32ioctl (psz_win32_drive); + } else { + return DRIVER_OP_UNSUPPORTED; /* not yet, but soon I hope */ + } +#else + return DRIVER_OP_UNSUPPORTED; +#endif +} + /*! Initialization routine. This is the only thing that doesn't get called via a function pointer. In fact *we* are the