diff options
| author | Wohlstand <admin@wohlnet.ru> | 2017-11-19 21:15:49 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2017-11-19 21:15:49 +0300 |
| commit | 74fcb092c9c084f2eae9a4dd491e682ed2d6cedc (patch) | |
| tree | 58989898d54c72b8da822bcfc8f0a69fbf5a4c83 | |
| parent | 7c9e90eb6b6e2b7459f056a9c76a1e3a12c27880 (diff) | |
| parent | 7e19a21b186de524447fc00c21c9bdb2985a0801 (diff) | |
| download | libADLMIDI-74fcb092c9c084f2eae9a4dd491e682ed2d6cedc.tar.gz libADLMIDI-74fcb092c9c084f2eae9a4dd491e682ed2d6cedc.tar.bz2 libADLMIDI-74fcb092c9c084f2eae9a4dd491e682ed2d6cedc.zip | |
Merge branch 'master' of git@github.com:Wohlstand/libADLMIDI.git
| -rw-r--r-- | src/adlmidi_private.hpp | 4 | ||||
| -rw-r--r-- | src/dbopl.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index ca503bc..39ec298 100644 --- a/src/adlmidi_private.hpp +++ b/src/adlmidi_private.hpp @@ -41,7 +41,7 @@ #ifdef _WIN32 # undef NO_OLDNAMES - +# include <stdint.h> # ifdef _MSC_VER # ifdef _WIN64 typedef __int64 ssize_t; @@ -49,7 +49,7 @@ typedef __int64 ssize_t; typedef __int32 ssize_t; # endif # define NOMINMAX //Don't override std::min and std::max -# elif !defined(__MINGW32__) +# else # ifdef _WIN64 typedef int64_t ssize_t; # else diff --git a/src/dbopl.h b/src/dbopl.h index e51a7a3..b5b2ba1 100644 --- a/src/dbopl.h +++ b/src/dbopl.h @@ -55,7 +55,7 @@ typedef __int64 ssize_t; # else typedef __int32 ssize_t; # endif -# elif !defined(__MINGW32__) +# else # ifdef _WIN64 typedef int64_t ssize_t; # else |