From 4bda0549a9e180f201156515fe35289652cf2ba0 Mon Sep 17 00:00:00 2001 From: Rick V Date: Mon, 19 Aug 2019 19:06:21 -0500 Subject: Fix Solaris 2.11 (non-Oracle) --- src/osd/modules/file/posixptty.cpp | 6 +++++- src/osd/modules/font/font_sdl.cpp | 2 +- src/osd/modules/output/network.cpp | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'src/osd') diff --git a/src/osd/modules/file/posixptty.cpp b/src/osd/modules/file/posixptty.cpp index 00aab42cf44..6e468cf172f 100644 --- a/src/osd/modules/file/posixptty.cpp +++ b/src/osd/modules/file/posixptty.cpp @@ -29,6 +29,10 @@ #include #elif defined(__HAIKU__) #include +#elif defined(__sun) +#include +#include +#include #endif @@ -112,7 +116,7 @@ osd_file::error posix_open_ptty(std::uint32_t openflags, osd_file::ptr &file, st else if (openflags & OPEN_FLAG_READ) access |= O_RDONLY; else - return error::INVALID_ACCESS; + return osd_file::error::INVALID_ACCESS; int const masterfd = ::posix_openpt(access); if (masterfd < 0) diff --git a/src/osd/modules/font/font_sdl.cpp b/src/osd/modules/font/font_sdl.cpp index 668fd2d5778..62a97d39149 100644 --- a/src/osd/modules/font/font_sdl.cpp +++ b/src/osd/modules/font/font_sdl.cpp @@ -8,7 +8,7 @@ #include "font_module.h" #include "modules/osdmodule.h" -#if defined(SDLMAME_UNIX) && !defined(SDLMAME_MACOSX) && !defined(SDLMAME_SOLARIS) && !defined(SDLMAME_HAIKU) && !defined(SDLMAME_ANDROID) +#if defined(SDLMAME_UNIX) && !defined(SDLMAME_MACOSX) && !defined(SDLMAME_HAIKU) && !defined(SDLMAME_ANDROID) #include "corestr.h" #include "corealloc.h" diff --git a/src/osd/modules/output/network.cpp b/src/osd/modules/output/network.cpp index f4db109c829..e92b009670f 100644 --- a/src/osd/modules/output/network.cpp +++ b/src/osd/modules/output/network.cpp @@ -14,6 +14,11 @@ #include "emu.h" +#ifdef __sun +#define ASIO_DISABLE_DEV_POLL +#define ASIO_HAS_EPOLL +#endif + #include #include #include "asio.h" -- cgit v1.2.3