diff options
| author | Gary Scavone <gary@music.mcgill.ca> | 2011-02-17 21:26:23 +0000 |
|---|---|---|
| committer | Stephen Sinclair <sinclair@music.mcgill.ca> | 2013-10-11 01:38:27 +0200 |
| commit | 24a98a1971301e582dc56ef2c6ac94c342b674dd (patch) | |
| tree | 8b9aa705b0fd522cd0231f79f25a6cbcde8f06b2 /include/iasiothiscallresolver.h | |
| parent | 3a4fb410cf0be7a7f4fc3777a15b104d8091f3b5 (diff) | |
Various changes in preparation for release 4.0.8
including fix of MinGW ASIO compile problem (iasiothiscallresolver),
OS-X problem handling device names in some languages (CFString
conversion), small change to OS-X MUTEX lock location to avoid
lockups, and correction to documentation regarding 24-bit data (should
be lower 3 bytes, not upper 3 bytes).
Diffstat (limited to 'include/iasiothiscallresolver.h')
| -rw-r--r-- | include/iasiothiscallresolver.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/iasiothiscallresolver.h b/include/iasiothiscallresolver.h index b59d910..63e91ca 100644 --- a/include/iasiothiscallresolver.h +++ b/include/iasiothiscallresolver.h @@ -115,7 +115,8 @@ // We only need IASIOThiscallResolver at all if we are on Win32. For other
// platforms we simply bypass the IASIOThiscallResolver definition to allow us
// to be safely #include'd whatever the platform to keep client code portable
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
+//#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
+#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)) && !defined(_WIN64)
// If microsoft compiler we can call IASIO directly so IASIOThiscallResolver
|