From a36b0c4fb8cfd3d28710f0cb7534e8a0d86cc3cb Mon Sep 17 00:00:00 2001 From: Ryan Spicer Date: Sun, 3 Nov 2013 12:06:54 -0800 Subject: MSVC 11 expects __declspec(dllexport) before return type. --- opentrack-api/context.cpp | 6 +++--- opentrack-api/opentrack.h | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/opentrack-api/context.cpp b/opentrack-api/context.cpp index 5b218f93..04fa5ac2 100644 --- a/opentrack-api/context.cpp +++ b/opentrack-api/context.cpp @@ -93,17 +93,17 @@ opentrack_ctx::~opentrack_ctx() extern "C" { -const char** OPENTRACK_EXPORT opentrack_enum_trackers(opentrack ctx) +OPENTRACK_EXPORT const char** opentrack_enum_trackers(opentrack ctx) { return const_cast(ctx->list); } -opentrack OPENTRACK_EXPORT opentrack_make_ctx(int argc, char** argv, void* window_parent) +OPENTRACK_EXPORT opentrack opentrack_make_ctx(int argc, char** argv, void* window_parent) { return new opentrack_ctx(argc, argv, window_parent); } -void OPENTRACK_EXPORT opentrack_finalize_ctx(opentrack foo) +OPENTRACK_EXPORT void opentrack_finalize_ctx(opentrack foo) { delete foo; } diff --git a/opentrack-api/opentrack.h b/opentrack-api/opentrack.h index b0883d50..990b6aa4 100644 --- a/opentrack-api/opentrack.h +++ b/opentrack-api/opentrack.h @@ -38,20 +38,20 @@ enum opentrack_dof { }; #endif -opentrack OPENTRACK_EXPORT opentrack_make_ctx(int argc, char** argv, void* window_parent); -void OPENTRACK_EXPORT opentrack_finalize_ctx(opentrack self); +OPENTRACK_EXPORT opentrack opentrack_make_ctx(int argc, char** argv, void* window_parent); +OPENTRACK_EXPORT void opentrack_finalize_ctx(opentrack self); /* no need to free the return value; invalid to modify it */ -const char** OPENTRACK_EXPORT opentrack_enum_trackers(opentrack self); +OPENTRACK_EXPORT const char** opentrack_enum_trackers(opentrack self); /* * don't `opentrack_tracker_tick an unstarted tracker, it's invalid to do so * it's also invalid to start a finalized tracker */ -opentrack_tracker OPENTRACK_EXPORT opentrack_make_tracker(opentrack ctx, const char* name); -void OPENTRACK_EXPORT opentrack_tracker_start(opentrack self, opentrack_tracker tracker); -int OPENTRACK_EXPORT opentrack_tracker_tick(opentrack_tracker tracker, double* headpose); -void OPENTRACK_EXPORT opentrack_finalize_tracker(opentrack_tracker tracker); +OPENTRACK_EXPORT opentrack_tracker opentrack_make_tracker(opentrack ctx, const char* name); +OPENTRACK_EXPORT void opentrack_tracker_start(opentrack self, opentrack_tracker tracker); +OPENTRACK_EXPORT int opentrack_tracker_tick(opentrack_tracker tracker, double* headpose); +OPENTRACK_EXPORT void opentrack_finalize_tracker(opentrack_tracker tracker); #ifdef __cplusplus } #endif -- cgit v1.2.3