DragonFly BSD support (thanks Masu)

git-svn-id: svn://ultimatepp.org/upp/trunk@7895 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-11-13 18:50:05 +00:00
parent 48b99e26e0
commit 08d4da8a15
7 changed files with 16 additions and 6 deletions

View file

@ -337,7 +337,7 @@ inline bool IsInf(double d) { return std::isinf(d); }
inline bool IsNaN(double d) { return _isnan(d); }
inline bool IsInf(double d) { return !_finite(d) && !_isnan(d); }
#endif
#elif __APPLE__
#elif __APPLE__ || __DragonFly__
inline bool IsNaN(double d) { return std::isnan(d); }
inline bool IsInf(double d) { return std::isinf(d); }
#else

View file

@ -31,7 +31,7 @@
#else
// zvzv mod
// was: #if __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __APPLE__
#if __FreeBSD__ || __OpenBSD__ || __NetBSD__
#if __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __DragonFly__
#define PLATFORM_BSD 1
#if __FreeBSD__
#define PLATFORM_FREEBSD 1
@ -42,6 +42,9 @@
#if __NetBSD__
#define PLATFORM_NETBSD 1
#endif
#if __DragonFly__
#define PLATFORM_DRAGONFLY 1
#endif
#elif __sun
#define PLATFORM_SOLARIS 1
#else

View file

@ -27,10 +27,12 @@ library(LINUX !XLFD !SHARED !RAINBOW GUI) "fontconfig Xrender freetype";
library(OSX11) "X11 Xft fontconfig Xrender freetype expat";
library(FREEBSD) xcb;
library(FREEBSD | DRAGONFLY) xcb;
library(POSIX !NOGTK !RAINBOW GUI) notify;
library(DRAGONFLY) "Xext Xinerama";
file
Core readonly separator,
CtrlCore.h,

View file

@ -1,9 +1,10 @@
#include "CtrlLib.h"
#include "ChGtk.h"
#ifdef PLATFORM_X11
#ifndef flagNOGTK
#include "ChGtk.h"
#define LLOG(x) // DLOG(x)
#define LDUMP(x) // DDUMP(x)

View file

@ -5,7 +5,7 @@ library(WIN32 GCC) "glaux glu32 opengl32";
library(LINUX) "GL GLU";
library(FREEBSD) "GL GLU";
library(BSD) "GL GLU";
library(GTK) "gdkglext-x11-1.0 gtkglext-x11-1.0";

View file

@ -12,7 +12,7 @@ namespace Upp {
String GetThreadName()
{
return FormatIntBase(Thread::GetCurrentId() % 33, 35);
return FormatIntBase((int64)(Thread::GetCurrentId()) % 33, 35);
}
namespace Ini {

View file

@ -338,6 +338,10 @@ void LocalHost::AddFlags(Index<String>& cfg)
cfg.Add("NETBSD");
#endif
#ifdef PLATFORM_DRAGONFLY
cfg.Add("DRAGONFLY");
#endif
#ifdef PLATFORM_SOLARIS
cfg.Add("SOLARIS");
#endif