From 0e4e1159e50d65c02c5110bc99f08a8eaa2f83b4 Mon Sep 17 00:00:00 2001 From: Ben Campbell Date: Fri, 13 Oct 2017 08:54:01 +1300 Subject: [PATCH] rename 'near' and 'far' params (caused msys2 problems) Looks like 'near' and 'far' are still pointer qualifiers under some compilers/environments. The gcc from msys2 refused to build. --- src/headset/fake.c | 12 ++++++------ src/headset/headset.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/headset/fake.c b/src/headset/fake.c index 14aa1d11..da92d730 100644 --- a/src/headset/fake.c +++ b/src/headset/fake.c @@ -175,14 +175,14 @@ void lovrHeadsetGetDisplayDimensions(int* width, int* height) { } -void lovrHeadsetGetClipDistance(float* near, float* far) { - *near = state.clipNear; - *far = state.clipFar; +void lovrHeadsetGetClipDistance(float* clipNear, float* clipFar) { + *clipNear = state.clipNear; + *clipFar = state.clipFar; } -void lovrHeadsetSetClipDistance(float near, float far) { - state.clipNear = near; - state.clipFar = far; +void lovrHeadsetSetClipDistance(float clipNear, float clipFar) { + state.clipNear = clipNear; + state.clipFar = clipFar; } diff --git a/src/headset/headset.h b/src/headset/headset.h index b23d99a4..c4b0b330 100644 --- a/src/headset/headset.h +++ b/src/headset/headset.h @@ -66,8 +66,8 @@ HeadsetOrigin lovrHeadsetGetOriginType(); int lovrHeadsetIsMirrored(); void lovrHeadsetSetMirrored(int mirror); void lovrHeadsetGetDisplayDimensions(int* width, int* height); -void lovrHeadsetGetClipDistance(float* near, float* far); -void lovrHeadsetSetClipDistance(float near, float far); +void lovrHeadsetGetClipDistance(float* clipNear, float* clipFar); +void lovrHeadsetSetClipDistance(float clipNear, float clipFar); float lovrHeadsetGetBoundsWidth(); float lovrHeadsetGetBoundsDepth(); void lovrHeadsetGetBoundsGeometry(float* geometry);