summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorJohn Emmas <johne53@tiscali.co.uk>2013-10-14 17:07:45 +0100
committerJohn Emmas <johne53@tiscali.co.uk>2013-10-14 17:07:45 +0100
commit404fb925332bee7024dd2d0fc3581147ee942994 (patch)
treef42fbf784f55a1a4d866ee747841171cadb88bfd /gtk2_ardour
parent8a4a86eff4dc1c9567416b704344c03e4bef5d03 (diff)
'gtk2_ardour' - Harmonize usage of 'COMPILER_MINGW' and 'COMPILER_MSVC' where appropriate
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/canvas-waveview.c2
-rw-r--r--gtk2_ardour/system_exec.cc3
2 files changed, 4 insertions, 1 deletions
diff --git a/gtk2_ardour/canvas-waveview.c b/gtk2_ardour/canvas-waveview.c
index 51384c0fad..6aff1be771 100644
--- a/gtk2_ardour/canvas-waveview.c
+++ b/gtk2_ardour/canvas-waveview.c
@@ -35,7 +35,7 @@
/* POSIX guarantees casting between void* and function pointers, ISO C doesn't
* We can work around warnings by going one step deeper in our casts
*/
-#if defined(_POSIX_VERSION) || defined(__MINGW32__)
+#if defined(_POSIX_VERSION) || defined(COMPILER_MINGW)
#define POSIX_FUNC_PTR_CAST(type, object) *((type*) &(object))
#endif // _POSIX_VERSION
diff --git a/gtk2_ardour/system_exec.cc b/gtk2_ardour/system_exec.cc
index 46b011171d..1a8399d22e 100644
--- a/gtk2_ardour/system_exec.cc
+++ b/gtk2_ardour/system_exec.cc
@@ -25,7 +25,10 @@
#include <unistd.h>
#include <assert.h>
+
+#ifndef COMPILER_MSVC
#include <dirent.h>
+#endif
#ifdef PLATFORM_WINDOWS
#include <windows.h>