# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
# include <dvd.h>
#endif
-#if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H)
+#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H)
# include <linux/version.h>
/* handy macro found in 2.1 kernels, but not in older ones */
# ifndef KERNEL_VERSION
# endif
# include <sys/types.h>
-# include <sys/stat.h>
# include <sys/ioctl.h>
# include <sys/ioctl.h>
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-#if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H)
+#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H)
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
* \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;
i_flags = MCI_OPEN_TYPE | MCI_OPEN_TYPE_ID |
MCI_OPEN_ELEMENT | MCI_OPEN_SHAREABLE;
- if( !mciSendCommand( 0, MCI_OPEN, i_flags, (unsigned long)&op ) )
+ if( !mciSendCommand( 0, MCI_OPEN, i_flags, (uintptr_t)&op ) )
{
st.dwItem = MCI_STATUS_READY;
/* Eject disc */
return VLC_EGENERIC;
}
-#if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H)
+#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H)
/* Try a simple ATAPI eject */
i_ret = ioctl( i_fd, CDROMEJECT, 0 );
/* The following functions are local */
-#if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H)
+#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H)
/*****************************************************************************
* Eject using SCSI commands. Return 0 if successful
*****************************************************************************/