summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
authorGravatarGravatar Rick V <rick@snowlight.net>2019-08-19 19:06:21 -0500
committerGravatarGravatar Rick V <rick@snowlight.net>2019-08-19 19:06:21 -0500
commit4bda0549a9e180f201156515fe35289652cf2ba0 (patch)
tree7e74cb1111b4f7f491ebfc96fc981b495f60f335 /src/osd
parent123d5fad6c7943f47f77cba240699fb8ba82f874 (diff)
Fix Solaris 2.11 (non-Oracle)
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/modules/file/posixptty.cpp6
-rw-r--r--src/osd/modules/font/font_sdl.cpp2
-rw-r--r--src/osd/modules/output/network.cpp5
3 files changed, 11 insertions, 2 deletions
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 <pty.h>
#elif defined(__HAIKU__)
#include <bsd/pty.h>
+#elif defined(__sun)
+#include <sys/types.h>
+#include <stropts.h>
+#include <sys/conf.h>
#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 <thread>
#include <set>
#include "asio.h"