summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl/sdlptty_unix.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-03-02 21:49:49 +0100
committer ImJezze <jezze@gmx.net>2016-03-02 21:49:49 +0100
commit9fe9f6d93e672bcd926f9e7461774bc9cc22e094 (patch)
tree3911b611dd010a4108b90fb8b8c82116eec21117 /src/osd/sdl/sdlptty_unix.cpp
parentdbdf21ee465acadf3e643d62d6bedfcc297ada85 (diff)
parent1914702e6fae052668df5b068a502bca57c9a3b0 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
# Resolved Conflicts: # src/osd/modules/render/d3d/d3dhlsl.cpp # src/osd/windows/winmain.cpp
Diffstat (limited to 'src/osd/sdl/sdlptty_unix.cpp')
-rw-r--r--src/osd/sdl/sdlptty_unix.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/sdl/sdlptty_unix.cpp b/src/osd/sdl/sdlptty_unix.cpp
index bd1751c15c2..063b999b75d 100644
--- a/src/osd/sdl/sdlptty_unix.cpp
+++ b/src/osd/sdl/sdlptty_unix.cpp
@@ -8,7 +8,7 @@
//
//============================================================
-#if (!defined(SDLMAME_SOLARIS) && !(defined(SDLMAME_OS2)))
+#if (!defined(SDLMAME_SOLARIS))
#include <sys/types.h>
#include <sys/uio.h>