OSDN Git Service
(root)
/
csp-qt
/
common_source_project-fm7.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[VM][Qt][OSD][Genaral] Sync to upstream ; phase 1: Merege upstream 20151217.
[csp-qt/common_source_project-fm7.git]
/
source
/
src
/
vm
/
disk.h
diff --git
a/source/src/vm/disk.h
b/source/src/vm/disk.h
index
c1997d2
..
96567f4
100644
(file)
--- a/
source/src/vm/disk.h
+++ b/
source/src/vm/disk.h
@@
-14,9
+14,6
@@
#include "vm.h"
#include "../emu.h"
#else
#include "vm.h"
#include "../emu.h"
#else
-# if !defined(_USE_QT)
-# include <windows.h>
-# endif
#include "../common.h"
#endif
#include "../common.h"
#endif