Minor cleanup

5 files changed, 11 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index c5763cb..8493f18 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ ifeq ($(UNAME), Darwin)
 REDISTS:=$(REDISTS) redist/hid-osx.c
 endif
 
-LIBSURVIVE_CORE:=src/survive.o src/survive_usb.o src/survive_charlesbiguator.o src/survive_process.o src/ootx_decoder.o src/survive_driverman.o src/survive_default_devices.o src/survive_vive.o src/survive_playback.o src/survive_config.o src/survive_cal.o src/survive_reproject.o src/poser.o src/epnp/epnp.o src/survive_sensor_activations.o src/survive_turveybiguator.o src/survive_disambiguator.o src/survive_statebased_disambiguator.o src/poser_charlesrefine.o src/survive_imu.o src/poser_imu.o
+LIBSURVIVE_CORE:=src/survive.o src/survive_usb.o src/survive_charlesbiguator.o src/survive_process.o src/ootx_decoder.o src/survive_driverman.o src/survive_default_devices.o src/survive_vive.o src/survive_playback.o src/survive_config.o src/survive_cal.o src/survive_reproject.o src/poser.o src/epnp/epnp.o src/survive_sensor_activations.o src/survive_turveybiguator.o src/survive_disambiguator.o src/survive_statebased_disambiguator.o src/poser_charlesrefine.o src/survive_imu.o src/poser_imu.o src/survive_api.o
 
 #If you want to use HIDAPI on Linux.
 #CFLAGS:=$(CFLAGS) -DHIDAPI
diff --git a/include/libsurvive/survive_api.h b/include/libsurvive/survive_api.h
index 30e30ac..aacd47a 100644
--- a/include/libsurvive/survive_api.h
+++ b/include/libsurvive/survive_api.h
@@ -8,7 +8,7 @@ extern "C" {
 	struct SurviveAsyncContext;
 	typedef struct SurviveAsyncContext SurviveAsyncContext;
 
-	SURVIVE_EXPORT SurviveAsyncContext *survive_asyc_init(int argc, char *const *argv);
+	SURVIVE_EXPORT SurviveAsyncContext *survive_async_init(int argc, char *const *argv);
 	SURVIVE_EXPORT void survive_async_close(SurviveAsyncContext* actx);
 
 	SURVIVE_EXPORT void survive_async_start_thread(SurviveAsyncContext* actx);
@@ -22,8 +22,9 @@ extern "C" {
 	SURVIVE_EXPORT const SurviveAsyncObject* survive_async_get_next_tracked(SurviveAsyncContext* actx, const SurviveAsyncObject* curr);
 	SURVIVE_EXPORT const SurviveAsyncObject* survive_async_get_next_updated(SurviveAsyncContext* actx);
 
-	SURVIVE_EXPORT survive_timecode survive_async_object_get_latest_pose(const SurviveAsyncObject* sao, SurvivePose* pose);
-	SURVIVE_EXPORT const char* survive_async_object_name(SurviveAsyncObject* sao);
+	SURVIVE_EXPORT survive_timecode survive_async_object_get_latest_pose(const SurviveAsyncObject *sao,
+																		 SurvivePose *OUTPUT);
+	SURVIVE_EXPORT const char *survive_async_object_name(const SurviveAsyncObject *sao);
 
 #ifdef __cplusplus
 }
diff --git a/include/libsurvive/survive_types.h b/include/libsurvive/survive_types.h
index b9d145f..7fa5e0f 100644
--- a/include/libsurvive/survive_types.h
+++ b/include/libsurvive/survive_types.h
@@ -4,11 +4,13 @@
 #include "linmath.h"
 #include "stdint.h"
 
+#ifndef SURVIVE_EXPORT
 #ifdef _WIN32
 #define SURVIVE_EXPORT __declspec(dllexport)
 #else
 #define SURVIVE_EXPORT __attribute__((visibility("default")))
 #endif
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/redist/linmath.h b/redist/linmath.h
index e268e96..bafdbe8 100644
--- a/redist/linmath.h
+++ b/redist/linmath.h
@@ -7,11 +7,13 @@
 extern "C" {
 #endif
 
+#ifndef LINMATH_EXPORT
 #ifdef _WIN32
 #define LINMATH_EXPORT __declspec(dllexport)
 #else
 #define LINMATH_EXPORT __attribute__((visibility("default")))
 #endif
+#endif
 
 // Yes, I know it's kind of arbitrary.
 #define DEFAULT_EPSILON 0.001
diff --git a/src/survive_api.c b/src/survive_api.c
index 9883c9f..2aaf31a 100644
--- a/src/survive_api.c
+++ b/src/survive_api.c
@@ -35,7 +35,7 @@ static void pose_fn(SurviveObject *so, uint32_t timecode, SurvivePose *pose) {
 	survive_default_raw_pose_process(so, timecode, pose);	
 
 	struct SurviveAsyncContext* actx = so->ctx->user_ptr;
-	int idx = so->user_ptr;
+	int idx = (int)so->user_ptr;
 	actx->objects[idx].has_update = true;
 }
 static void lh_fn(SurviveContext *ctx, uint8_t lighthouse, SurvivePose *lighthouse_pose,
@@ -46,7 +46,7 @@ static void lh_fn(SurviveContext *ctx, uint8_t lighthouse, SurvivePose *lighthou
 	actx->objects[lighthouse].has_update = true;
 }
 
-struct SurviveAsyncContext *survive_asyc_init(int argc, char *const *argv) {
+struct SurviveAsyncContext *survive_async_init(int argc, char *const *argv) {
 	SurviveContext* ctx = survive_init(argc, argv);
 	if (ctx == 0)
 		return 0;