summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/ui/utils.h
diff options
context:
space:
mode:
author therealmogminer@gmail.com <therealmogminer@gmail.com>2016-03-21 08:27:06 +0100
committer therealmogminer@gmail.com <therealmogminer@gmail.com>2016-03-21 08:27:06 +0100
commita99df788017c2bf5a56034d4f9152bf8ab95a168 (patch)
tree3beec27b413c75b8f9f88199519e45fd07959bf8 /src/emu/ui/utils.h
parentb224d9a77ad6483daf2b60b75dbdc323a3bcd4b0 (diff)
parent3afd990226a2c647290579bebb5537bd0fd3faac (diff)
Merge with master
Diffstat (limited to 'src/emu/ui/utils.h')
-rw-r--r--src/emu/ui/utils.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/ui/utils.h b/src/emu/ui/utils.h
index a2f24a20479..d6087131285 100644
--- a/src/emu/ui/utils.h
+++ b/src/emu/ui/utils.h
@@ -1,5 +1,5 @@
// license:BSD-3-Clause
-// copyright-holders:Dankan1890
+// copyright-holders:Maurizio Petrarota
/***************************************************************************
ui/utils.h
@@ -271,9 +271,9 @@ void render_load_jpeg(_T &bitmap, emu_file &file, const char *dirname, const cha
else
fname.assign(dirname).append(PATH_SEPARATOR).append(filename);
- file_error filerr = file.open(fname.c_str());
+ osd_file::error filerr = file.open(fname.c_str());
- if (filerr != FILERR_NONE)
+ if (filerr != osd_file::error::NONE)
return;
// define standard JPEG structures