Skip to content

Restrict overmatching MACH ifdef to only trigger on OSX and Mach #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zopolis4 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Restrict overmatching MACH ifdef to only trigger on OSX and Mach #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/o3dgc_common_lib/inc/o3dgcTimer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ THE SOFTWARE.

#ifdef WIN32
#include <windows.h>
#elif __MACH__
#elif defined(__MACH__) && defined (__APPLE__)
#include <mach/clock.h>
#include <mach/mach.h>
#else
Expand Down Expand Up @@ -71,7 +71,7 @@ namespace o3dgc
LARGE_INTEGER m_freq;

};
#elif __MACH__
#elif defined(__MACH__) && defined (__APPLE__)
class Timer
{
public:
Expand Down