diff options
author | 2016-03-02 21:49:49 +0100 | |
---|---|---|
committer | 2016-03-02 21:49:49 +0100 | |
commit | 9fe9f6d93e672bcd926f9e7461774bc9cc22e094 (patch) | |
tree | 3911b611dd010a4108b90fb8b8c82116eec21117 /src/osd/sdl/sdlos_os2.cpp | |
parent | dbdf21ee465acadf3e643d62d6bedfcc297ada85 (diff) | |
parent | 1914702e6fae052668df5b068a502bca57c9a3b0 (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/sdlos_os2.cpp')
-rw-r--r-- | src/osd/sdl/sdlos_os2.cpp | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/osd/sdl/sdlos_os2.cpp b/src/osd/sdl/sdlos_os2.cpp deleted file mode 100644 index d559d43b553..00000000000 --- a/src/osd/sdl/sdlos_os2.cpp +++ /dev/null @@ -1,36 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Olivier Galibert, R. Belmont -//============================================================ -// -// sdlos_*.c - OS specific low level code -// -// SDLMAME by Olivier Galibert and R. Belmont -// -//============================================================ - -// standard sdl header -#include "sdlinc.h" -#include <unistd.h> -#include <stdio.h> -#include <string.h> -#include <ctype.h> -#include <stdlib.h> -#include <sys/stat.h> - -#define INCL_DOS -#include <os2.h> - -// MAME headers -#include "osdcore.h" - -//============================================================ -// osd_get_clipboard_text -// - used in MESS -//============================================================ - -char *osd_get_clipboard_text(void) -{ - char *result = NULL; - - return result; -} |