dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-07-07 17:28:19 +01:00
parent 641e682e3f de4dc792a9
commit 737ced9f50
18 changed files with 138 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/music/dmusic.cpp
View File

@@ -10,7 +10,7 @@
#define INITGUID
#include "../stdafx.h"
#ifdef WIN32_LEAN_AND_MEAN
#undef WIN32_LEAN_AND_MEAN // Don't exclude rarely-used stuff from Windows headers
# undef WIN32_LEAN_AND_MEAN // Don't exclude rarely-used stuff from Windows headers
#endif
#include "../debug.h"
#include "../os/windows/win32.h"