diff options
| author | Wohlstand <admin@wohlnet.ru> | 2017-12-01 03:15:44 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2017-12-01 03:15:44 +0300 |
| commit | 3f8560af1584965706e2b4ec5614212f5653f34c (patch) | |
| tree | 7126d33bc83d91fa90e6e7397b7423ab0f5910e0 /src/adlmidi_private.hpp | |
| parent | af748761f0b9df54a5cc673ebc5704c60513e3db (diff) | |
| parent | 1e4a04ac49c44e4014997ee4785b20a8a00cbdd0 (diff) | |
| download | libADLMIDI-3f8560af1584965706e2b4ec5614212f5653f34c.tar.gz libADLMIDI-3f8560af1584965706e2b4ec5614212f5653f34c.tar.bz2 libADLMIDI-3f8560af1584965706e2b4ec5614212f5653f34c.zip | |
Merge branch 'master' into get-rid-of-backup-buffer
Diffstat (limited to 'src/adlmidi_private.hpp')
| -rw-r--r-- | src/adlmidi_private.hpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index 32c3637..2442fc2 100644 --- a/src/adlmidi_private.hpp +++ b/src/adlmidi_private.hpp @@ -40,8 +40,12 @@ #endif #ifdef _WIN32 +#define NOMINMAX +#endif + +#if defined(_WIN32) && !defined(__WATCOMC__) # undef NO_OLDNAMES -# include <stdint.h> +# include <stdint.h> # ifdef _MSC_VER # ifdef _WIN64 typedef __int64 ssize_t; @@ -91,6 +95,9 @@ typedef int32_t ssize_t; #include <vector> // vector #include <deque> // deque #include <cmath> // exp, log, ceil +#if defined(__WATCOMC__) +#include <math.h> // round, sqrt +#endif #include <stdio.h> #include <stdlib.h> #include <limits> // numeric_limit @@ -328,7 +335,7 @@ public: void openFile(const char *path) { - #ifndef _WIN32 + #if !defined(_WIN32) || defined(__WATCOMC__) fp = std::fopen(path, "rb"); #else wchar_t widePath[MAX_PATH]; |