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

Reorder includes for drive_cache

Browse source 
Class DOS_Drive_Cache is declared in dos_system.h, but this header was
indirectly included.  Remove faulty windows.h include (the correct one
exists in cross.h already).
This commit is contained in:
Patryk Obara 2020-02-05 19:15:13 +01:00 • committed by Patryk Obara
parent 079e1e1aa0
commit 4a6704367b
2 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/dos_system.h
View file

@ -16,23 +16,16 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef DOSBOX_DOS_SYSTEM_H
#define DOSBOX_DOS_SYSTEM_H
#include <vector>
#ifndef DOSBOX_DOSBOX_H
#include "dosbox.h"
#endif
#ifndef DOSBOX_CROSS_H
#include <vector>
#include "cross.h"
#endif
#ifndef DOSBOX_SUPPORT_H
#include "support.h"
#endif
#ifndef DOSBOX_MEM_H
#include "mem.h"
#endif
#include "support.h"
#define DOS_NAMELENGTH 12
#define DOS_NAMELENGTH_ASCII (DOS_NAMELENGTH+1)
@ -301,4 +294,5 @@ void DOS_AddDevice(DOS_Device * adddev);
void DOS_DelDevice(DOS_Device * dev);
void VFILE_Register(const char * name,Bit8u * data,Bit32u size);
#endif

22
src/dos/drive_cache.cpp
View file

@ -16,23 +16,17 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "dos_system.h"
#include "drives.h"
#include "dos_inc.h"
#include "support.h"
#include "cross.h"
// System includes
#include <assert.h>
#include <vector>
#include <iterator>
#include <algorithm>
#include <cassert>
#include <iterator>
#include <vector>
#if defined (WIN32) /* Win 32 */
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from
#include <windows.h>
#endif
#include "cross.h"
#include "dos_inc.h"
#include "drives.h"
#include "support.h"
int fileInfoCounter = 0;