Freetype: account for more complex font names on Windows

[vlc] / src / interface / intf_eject.c

diff --git a/src/interface/intf_eject.c b/src/interface/intf_eject.c
index 17946e41c5b1c9fefaf1d0f772519ad25cb50959..98f95d407c232934d5d30d6b47e6a3541cb0b2a2 100644 (file)
--- a/src/interface/intf_eject.c
+++ b/src/interface/intf_eject.c
@@ -83,13 +83,7 @@
 static int EjectSCSI ( int i_fd );
 #endif
 
-/*****************************************************************************
- * intf_Eject: eject the CDRom
- *****************************************************************************
- * returns 0 on success
- * returns 1 on failure
- * returns -1 if not implemented
- *****************************************************************************/
+#undef intf_Eject
 /**
  * \brief Ejects the CD /DVD
  * \ingroup vlc_interface
@@ -97,7 +91,7 @@ static int EjectSCSI ( int i_fd );
  * \param psz_device the CD/DVD to eject
  * \return 0 on success, 1 on failure, -1 if not implemented
  */
-int __intf_Eject( vlc_object_t *p_this, const char *psz_device )
+int intf_Eject( vlc_object_t *p_this, const char *psz_device )
 {
     VLC_UNUSED(p_this);
     int i_ret = VLC_SUCCESS;
@@ -151,7 +145,6 @@ int __intf_Eject( vlc_object_t *p_this, const char *psz_device )
 
 #elif defined(WIN32)
     MCI_OPEN_PARMS op;
-    MCI_STATUS_PARMS st;
     DWORD i_flags;
     char psz_drive[4];
 
@@ -168,7 +161,6 @@ int __intf_Eject( vlc_object_t *p_this, const char *psz_device )
 
     if( !mciSendCommand( 0, MCI_OPEN, i_flags, (uintptr_t)&op ) )
     {
-        st.dwItem = MCI_STATUS_READY;
         /* Eject disc */
         i_ret = mciSendCommand( op.wDeviceID, MCI_SET, MCI_SET_DOOR_OPEN, 0 );
         /* Release access to the device */