valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

fix header include differences between mingw and visual c

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1533
This commit is contained in:
Sjoerd van der Berg 2004-01-02 23:43:52 +00:00
parent 19e4adbc5a
commit 896f3fa1b9
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/dos/cdrom_aspi_win32.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: cdrom_aspi_win32.cpp,v 1.8 2004-01-02 23:10:31 finsterr Exp $ */
/* $Id: cdrom_aspi_win32.cpp,v 1.9 2004-01-02 23:43:52 harekiet Exp $ */
#if defined (WIN32)
@ -27,11 +27,17 @@
//Are actually system includes but leave for now
#include "wnaspi32.h"
#include "ntddcdrm.h"
#include "ntddscsi.h"
#include "scsidefs.h"
#include <winioctl.h>
#if defined (_MSC_VER)
#include <ntddcdrm.h> // Ioctl stuff
#include <ntddscsi.h>
#include <winioctl.h> // Ioctl stuff
#else
#include "ddk/ntddcdrm.h" // Ioctl stuff
#include "ddk/ntddscsi.h"
#endif
#include "scsidefs.h"
// *****************************************************************
// Windows ASPI functions (should work for all WIN with ASPI layer)

11
src/dos/cdrom_ioctl_win32.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: cdrom_ioctl_win32.cpp,v 1.8 2004-01-02 23:10:31 finsterr Exp $ */
/* $Id: cdrom_ioctl_win32.cpp,v 1.9 2004-01-02 23:43:52 harekiet Exp $ */
#if defined (WIN32)
@ -25,10 +25,15 @@
// *****************************************************************
#include <windows.h>
#include <winioctl.h> // Ioctl stuff
#include <io.h>
#include "ntddcdrm.h" // Ioctl stuff
#if defined (_MSC_VER)
#include <ntddcdrm.h> // Ioctl stuff
#include <winioctl.h> // Ioctl stuff
#else
#include "ddk/ntddcdrm.h" // Ioctl stuff
#endif
#include "cdrom.h"
CDROM_Interface_Ioctl::CDROM_Interface_Ioctl()