On Mon, Mar 12, 2018 at 06:10:37PM +0000, Stuart Henderson wrote:
> In file included from ../App/CanvasAppliance.cpp:18:
> In file included from ../../Fotowall-0.9/Canvas/CanvasViewContent.h:18:
> In file included from ../../Fotowall-0.9/Canvas/AbstractContent.h:19:
> ../../Fotowall-0.9/3rdparty/enricomath.h:291:20: error: static declaration of
> 'sincos' follows non-static declaration
> static inline void sincos(double th, double *s, double *c)
> ^
> /usr/include/math.h:276:6: note: previous declaration is here
> void sincos(double, double *, double *);
> ^
> 1 error generated.
Oh, at least that one is easy...
Index: patches/patch-3rdparty_enricomath_h
===================================================================
RCS file: patches/patch-3rdparty_enricomath_h
diff -N patches/patch-3rdparty_enricomath_h
--- patches/patch-3rdparty_enricomath_h 30 Aug 2016 15:19:49 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-3rdparty_enricomath_h,v 1.1.1.1 2016/08/30 15:19:49 awolk Exp $
---- 3rdparty/enricomath.h.orig Sun Jul 10 22:55:21 2016
-+++ 3rdparty/enricomath.h Sun Jul 10 23:03:34 2016
-@@ -286,8 +286,8 @@ class Matrix3
- #include <math.h>
- #include <stdio.h>
-
--#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
--//sincos is not defined in win32 and MAC
-+#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) || defined(Q_OS_OPENBSD)
-+//sincos is not defined in win32, MAC and OpenBSD
- static inline void sincos(double th, double *s, double *c)
- {
- *s = sin(th);
Ciao,
Kili