From 6afe78328fbb368bae7f2c39e4e43c7a49b647f6 Mon Sep 17 00:00:00 2001 From: dmitrykos Date: Wed, 7 Apr 2010 21:07:55 +0000 Subject: [PATCH] excluded x86-64 platform from ASIO 'thiscall' resolver as x64 ABI does not have 'thiscall' calling convention anymore --- src/hostapi/asio/iasiothiscallresolver.cpp | 2 +- src/hostapi/asio/iasiothiscallresolver.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hostapi/asio/iasiothiscallresolver.cpp b/src/hostapi/asio/iasiothiscallresolver.cpp index 8dfefbd..28f26df 100644 --- a/src/hostapi/asio/iasiothiscallresolver.cpp +++ b/src/hostapi/asio/iasiothiscallresolver.cpp @@ -156,7 +156,7 @@ // 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__)) && !defined(_WIN64) // If microsoft compiler we can call IASIO directly so IASIOThiscallResolver diff --git a/src/hostapi/asio/iasiothiscallresolver.h b/src/hostapi/asio/iasiothiscallresolver.h index 2ecfed7..21d53b3 100644 --- a/src/hostapi/asio/iasiothiscallresolver.h +++ b/src/hostapi/asio/iasiothiscallresolver.h @@ -111,7 +111,7 @@ // 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__)) && !defined(_WIN64) // If microsoft compiler we can call IASIO directly so IASIOThiscallResolver -- 2.43.0