Attachment 170358 Details for Bug 209549 – Disable abs() redefinions under libc++ in devel/upp

[patch] Disable abs() redefinions under libc++ in devel/upp

devel__upp-fix-abs-1.diff (text/plain), 1.31 KB, created by Dimitry Andric on 2016-05-16 14:20:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2016-05-16 14:20:59 UTC

Size: 1.31 KB

patch

obsolete

>Index: devel/upp/files/patch-uppsrc_Core_Core.h
>===================================================================
>--- devel/upp/files/patch-uppsrc_Core_Core.h	(nonexistent)
>+++ devel/upp/files/patch-uppsrc_Core_Core.h	(working copy)
>@@ -0,0 +1,18 @@
>+--- uppsrc/Core/Core.h.orig	2015-11-29 14:17:07 UTC
>++++ uppsrc/Core/Core.h
>+@@ -342,12 +342,12 @@ static const MemDiagCls sMemDiagHelper__
>+ 
>+ //some global definitions
>+ 
>+-#if !defined(STLPORT) && _MSC_VER < 1600
>++#if !defined(STLPORT) && _MSC_VER < 1600 && !defined(_LIBCPP_VERSION)
>+ inline UPP::int64  abs(UPP::int64 x)          { return x < 0 ? -x : x; }
>+ #endif
>+ 
>+-#ifdef COMPILER_GCC
>+-inline double abs(double x)                   { return fabs(x); }
>++#if defined(COMPILER_GCC) && !defined(_LIBCPP_VERSION)
>++inline double abs(double x) throw()           { return fabs(x); }
>+ #endif
>+ 
>+ void      RegisterTopic__(const char *topicfile, const char *topic, const char *title, const UPP::byte *data, int len);
>
>Property changes on: devel/upp/files/patch-uppsrc_Core_Core.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 209549: 170358