diff --git a/common/jack/systemdeps.h b/common/jack/systemdeps.h index b4a14720..ce0c2f74 100644 --- a/common/jack/systemdeps.h +++ b/common/jack/systemdeps.h @@ -58,7 +58,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #endif -#if defined(WIN32) && !defined(__CYGWIN__) && !defined(GNU_WIN32) +#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(GNU_WIN32) #include @@ -101,7 +101,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. typedef pthread_t jack_native_thread_t; #endif -#endif /* WIN32 && !__CYGWIN__ && !GNU_WIN32 */ +#endif /* _WIN32 && !__CYGWIN__ && !GNU_WIN32 */ #if defined(__APPLE__) || defined(__linux__) || defined(__sun__) || defined(sun) || defined(__unix__) || defined(__CYGWIN__) || defined(GNU_WIN32) diff --git a/common/jack/thread.h b/common/jack/thread.h index a4c19cd3..776c5206 100644 --- a/common/jack/thread.h +++ b/common/jack/thread.h @@ -122,7 +122,7 @@ int jack_client_stop_thread(jack_client_t* client, jack_native_thread_t thread) */ int jack_client_kill_thread(jack_client_t* client, jack_native_thread_t thread) JACK_OPTIONAL_WEAK_EXPORT; -#ifndef WIN32 +#ifndef _WIN32 typedef int (*jack_thread_creator_t)(pthread_t*, const pthread_attr_t*, diff --git a/common/jack/weakmacros.h b/common/jack/weakmacros.h index 2db602e6..944fddb9 100644 --- a/common/jack/weakmacros.h +++ b/common/jack/weakmacros.h @@ -47,7 +47,7 @@ require linker arguments in the client as well. */ -#ifdef WIN32 +#ifdef _WIN32 /* Not working with __declspec(dllexport) so normal linking Linking with JackWeakAPI.cpp will be the preferred way. @@ -60,7 +60,7 @@ #else /* Add other things here for non-gcc platforms */ -#ifdef WIN32 +#ifdef _WIN32 #define JACK_WEAK_EXPORT #endif @@ -81,7 +81,7 @@ #else /* Add other things here for non-gcc platforms */ -#ifdef WIN32 +#ifdef _WIN32 #define JACK_OPTIONAL_WEAK_DEPRECATED_EXPORT #endif