diff options
author | Rick V <rick@snowlight.net> | 2019-08-19 19:06:21 -0500 |
---|---|---|
committer | Rick V <rick@snowlight.net> | 2019-08-19 19:06:21 -0500 |
commit | 4bda0549a9e180f201156515fe35289652cf2ba0 (patch) | |
tree | 7e74cb1111b4f7f491ebfc96fc981b495f60f335 /src/emu | |
parent | 123d5fad6c7943f47f77cba240699fb8ba82f874 (diff) |
Fix Solaris 2.11 (non-Oracle)
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/http.cpp | 4 | ||||
-rw-r--r-- | src/emu/save.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/emu/http.cpp b/src/emu/http.cpp index c6a8bc011f0..3a28fa270c0 100644 --- a/src/emu/http.cpp +++ b/src/emu/http.cpp @@ -7,6 +7,10 @@ http.cpp HTTP server handling ***************************************************************************/ +#ifdef __sun +#define ASIO_DISABLE_DEV_POLL +#define ASIO_HAS_EPOLL +#endif #include "emu.h" #include "server_ws_impl.hpp" diff --git a/src/emu/save.h b/src/emu/save.h index cfdf119a156..66fba6777a7 100644 --- a/src/emu/save.h +++ b/src/emu/save.h @@ -267,7 +267,11 @@ public: // template specializations to enumerate the fundamental atomic types you are allowed to save ALLOW_SAVE_TYPE_AND_ARRAY(char) ALLOW_SAVE_TYPE (bool); // std::vector<bool> may be packed internally +#ifdef __sun +ALLOW_SAVE_TYPE_AND_ARRAY(signed char) +#else ALLOW_SAVE_TYPE_AND_ARRAY(s8) +#endif ALLOW_SAVE_TYPE_AND_ARRAY(u8) ALLOW_SAVE_TYPE_AND_ARRAY(s16) ALLOW_SAVE_TYPE_AND_ARRAY(u16) |