From 7fd4d4d6b2827ec74eb9edfc0ddbbf0b59474f5c Mon Sep 17 00:00:00 2001 From: Kai Lehmkuehler Date: Mon, 5 Nov 2018 20:12:54 +0100 Subject: [PATCH] fix osx abs ambiguity (#142) --- xpcPlugin/XPCPlugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xpcPlugin/XPCPlugin.cpp b/xpcPlugin/XPCPlugin.cpp index 065280b..0b75667 100755 --- a/xpcPlugin/XPCPlugin.cpp +++ b/xpcPlugin/XPCPlugin.cpp @@ -66,7 +66,8 @@ // System Includes #include -#include +#include +#include #ifdef __APPLE__ #include #endif @@ -95,8 +96,7 @@ PLUGIN_API int XPluginStart(char* outName, char* outSig, char* outDesc) strcpy(outDesc, "X Plane Communications Toolbox\nCopyright (c) 2013-2018 United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All Rights Reserved."); #if (__APPLE__) - int (*_abs)( int ) = & std::abs; // Needed to resolve ambiguity for OS X compilation - if ( _abs(timeConvert) <= 1e-9 ) // is about 0 + if ( abs(timeConvert) <= 1e-9 ) // is about 0 { mach_timebase_info_data_t timeBase; (void)mach_timebase_info(&timeBase);