diff options
author | 2015-12-13 11:23:55 +0100 | |
---|---|---|
committer | 2015-12-13 11:23:55 +0100 | |
commit | 4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch) | |
tree | df0e1d28daa79b9151088498a933cd1fc37c9c07 /src/osd/osdmini/minimisc.cpp | |
parent | 1cda42b22e591965ee69561fcf52272bd991b3b2 (diff) | |
parent | 14d5966a379e9783ba724750a5f84a72af62cadc (diff) |
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/osd/osdmini/minimisc.cpp')
-rw-r--r-- | src/osd/osdmini/minimisc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osd/osdmini/minimisc.cpp b/src/osd/osdmini/minimisc.cpp index 21d658ace5b..c6bb413b292 100644 --- a/src/osd/osdmini/minimisc.cpp +++ b/src/osd/osdmini/minimisc.cpp @@ -79,7 +79,7 @@ void osd_break_into_debugger(const char *message) char *osd_get_clipboard_text(void) { // can't support clipboards generically - return NULL; + return nullptr; } //============================================================ @@ -88,7 +88,7 @@ char *osd_get_clipboard_text(void) const char *osd_getenv(const char *name) { - return NULL; + return nullptr; } //============================================================ |