summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/lib/osdlib_unix.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/modules/lib/osdlib_unix.cpp')
-rw-r--r--src/osd/modules/lib/osdlib_unix.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/osd/modules/lib/osdlib_unix.cpp b/src/osd/modules/lib/osdlib_unix.cpp
index ba3eec9662c..2b0e7a3d780 100644
--- a/src/osd/modules/lib/osdlib_unix.cpp
+++ b/src/osd/modules/lib/osdlib_unix.cpp
@@ -90,34 +90,33 @@ void osd_free_executable(void *ptr, size_t size)
void osd_break_into_debugger(const char *message)
{
- #ifdef MAME_DEBUG
+#ifdef MAME_DEBUG
printf("MAME exception: %s\n", message);
printf("Attempting to fall into debugger\n");
kill(getpid(), SIGTRAP);
- #else
+#else
printf("Ignoring MAME exception: %s\n", message);
- #endif
+#endif
}
#ifdef SDLMAME_ANDROID
-char *osd_get_clipboard_text(void)
+std::string osd_get_clipboard_text(void)
{
- return nullptr;
+ return std::string();
}
#else
//============================================================
// osd_get_clipboard_text
//============================================================
-char *osd_get_clipboard_text(void)
+std::string osd_get_clipboard_text(void)
{
- char *result = nullptr;
+ std::string result;
if (SDL_HasClipboardText())
{
char *temp = SDL_GetClipboardText();
- result = (char *) malloc(strlen(temp) + 1);
- strcpy(result, temp);
+ result.assign(temp);
SDL_free(temp);
}
return result;