zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:coelckers/gzdoom.git 

# Conflicts:
#	src/sound/opnmidi/opnmidi_private.hpp
This commit is contained in:
Vitaly Novichkov 2018-03-25 00:41:11 +03:00
parent 15e133afb9 73f9300c2b
commit d202ef9e68
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sound/opnmidi/opnmidi_private.hpp
View File

@ -78,12 +78,12 @@ typedef __int32 ssize_t;
#include <algorithm>
#ifdef _MSC_VER
#pragma warning(disable:4319)
#pragma warning(disable:4267)
#pragma warning(disable:4244)
#pragma warning(disable:4267)
#pragma warning(disable:4146)
#endif
#include "fraction.hpp"
#ifdef OPNMIDI_USE_LEGACY_EMULATOR
#include "Ym2612_ChipEmu.h"
@ -94,6 +94,7 @@ typedef __int32 ssize_t;
#include "opnbank.h"
#include "opnmidi.h"
#define ADL_UNUSED(x) (void)x
extern std::string OPN2MIDI_ErrorString;