From d94a9684ab9bad6901bad0cf356ec6c7ef879652 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 5 Jul 2018 15:11:57 +0000 Subject: [PATCH] Core: MacOS adjustments git-svn-id: svn://ultimatepp.org/upp/trunk@12044 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/Color.cpp | 2 +- uppsrc/Core/Color.h | 2 +- uppsrc/Core/config.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/uppsrc/Core/Color.cpp b/uppsrc/Core/Color.cpp index 3c48c12e5..08ece119c 100644 --- a/uppsrc/Core/Color.cpp +++ b/uppsrc/Core/Color.cpp @@ -1,5 +1,5 @@ #include "Core.h" - + namespace Upp { void RGBtoHSV(double r, double g, double b, double& h, double& s, double& v) diff --git a/uppsrc/Core/Color.h b/uppsrc/Core/Color.h index bc9c6cb1a..baf8a9da1 100644 --- a/uppsrc/Core/Color.h +++ b/uppsrc/Core/Color.h @@ -5,7 +5,7 @@ struct RGBA : Moveable { #endif #ifdef PLATFORM_POSIX -#ifdef CPU_BE +#if defined(CPU_BE) || defined(PLATFORM_MACOS) struct RGBA : Moveable { byte a, r, g, b; }; diff --git a/uppsrc/Core/config.h b/uppsrc/Core/config.h index fdaa809f8..586136167 100644 --- a/uppsrc/Core/config.h +++ b/uppsrc/Core/config.h @@ -35,6 +35,7 @@ #define PLATFORM_OSX11 1 #define PLATFORM_BSD 1 #define flagNOGTK + #define PLATFORM_MACOS #else // zvzv mod // was: #if __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __APPLE__