smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-12 01:26:31 +01:00
Code Issues Projects Releases Wiki Activity

second part of windows/osx macro change - forgot *.cpp files

Browse source
This commit is contained in:
Paul Davis 2014-05-01 09:39:11 -04:00
parent 49423427a6
commit fa139421b9
4 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/backends/wavesaudio/wavesapi/threads/WCThreadSafe.cpp
View file

@ -7,10 +7,10 @@
#endif // XPLATFORMTHREADS_WINDOWS
#if defined(__MACOS__)
#if defined(__APPLE__)
#include <CoreServices/CoreServices.h>
#include <stdio.h>
#endif // __MACOS__
#endif // __APPLE__
#if XPLATFORMTHREADS_POSIX
#include </usr/include/unistd.h> // avoid the framework version and use the /usr/include version
@ -87,7 +87,7 @@ namespace wvThread
return nTicksPerMicrosecond;
}
#if defined(__MACOS__) //&& !defined(__MACH__)
#if defined(__APPLE__) //&& !defined(__MACH__)
bool FindNetInterfaceByIPAddress(const char *sIP, char *sInterface) // sIP and sInterface are both char[16]
@ -143,7 +143,7 @@ namespace wvThread
return timestamp(uint32_t(TSC.QuadPart/nTicksPerMicrosecond));
}
else return timestamp(0);
#elif defined(__MACOS__)
#elif defined(__APPLE__)
if (nTicksPerMicrosecond) {} // prevent 'unused' warnings
UnsignedWide usecs;
::Microseconds(&usecs);