From a6e758175dfcc657f705e87df48dc5b6dd40bc56 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 14 Mar 2016 19:51:52 +1100 Subject: [PATCH] Fixes for Linux --- src/osd/modules/file/posixfile.cpp | 1 + src/osd/modules/font/font_sdl.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/osd/modules/file/posixfile.cpp b/src/osd/modules/file/posixfile.cpp index 3fe7ca9fa90..5e0318d04fd 100644 --- a/src/osd/modules/file/posixfile.cpp +++ b/src/osd/modules/file/posixfile.cpp @@ -37,6 +37,7 @@ #include #include +#include #include #include #include diff --git a/src/osd/modules/font/font_sdl.cpp b/src/osd/modules/font/font_sdl.cpp index ad5d1699e3b..ace9963a28b 100644 --- a/src/osd/modules/font/font_sdl.cpp +++ b/src/osd/modules/font/font_sdl.cpp @@ -73,7 +73,7 @@ bool osd_font_sdl::open(const char *font_path, const char *_name, int &height) osd_printf_verbose("Searching font %s in -%s\n", name.c_str(), OPTION_FONTPATH); //emu_file file(options().font_path(), OPEN_FLAG_READ); emu_file file(font_path, OPEN_FLAG_READ); - if (file.open(name.c_str()) == FILERR_NONE) + if (file.open(name.c_str()) == osd_file::error::NONE) { std::string full_name = file.fullpath(); font = TTF_OpenFont_Magic(full_name, POINT_SIZE); @@ -185,7 +185,7 @@ bool osd_font_sdl::get_bitmap(unicode_char chnum, bitmap_argb32 &bitmap, INT32 & TTF_Font * osd_font_sdl::TTF_OpenFont_Magic(std::string name, int fsize) { emu_file file(OPEN_FLAG_READ); - if (file.open(name.c_str()) == FILERR_NONE) + if (file.open(name.c_str()) == osd_file::error::NONE) { unsigned char buffer[5] = { 0xff, 0xff, 0xff, 0xff, 0xff }; unsigned char magic[5] = { 0x00, 0x01, 0x00, 0x00, 0x00 }; @@ -199,7 +199,7 @@ TTF_Font * osd_font_sdl::TTF_OpenFont_Magic(std::string name, int fsize) bool osd_font_sdl::BDF_Check_Magic(std::string name) { emu_file file(OPEN_FLAG_READ); - if (file.open(name.c_str()) == FILERR_NONE) + if (file.open(name.c_str()) == osd_file::error::NONE) { unsigned char buffer[9]; unsigned char magic[9] = { 'S', 'T', 'A', 'R', 'T', 'F', 'O', 'N', 'T' };