From 1e4a04ac49c44e4014997ee4785b20a8a00cbdd0 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Fri, 1 Dec 2017 00:32:15 +0300 Subject: Some fixes on non-DOS OpenWatcom targets Unfortunately, std::fflush() causes a crash on Linux but works fine on DOS --- src/adlmidi_private.hpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index 8058824..6ab9437 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 +# include # ifdef _MSC_VER # ifdef _WIN64 typedef __int64 ssize_t; @@ -91,6 +95,9 @@ typedef int32_t ssize_t; #include // vector #include // deque #include // exp, log, ceil +#if defined(__WATCOMC__) +#include // round, sqrt +#endif #include #include #include // 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]; -- cgit v1.2.3