diff options
author | 2016-10-22 11:31:49 +0200 | |
---|---|---|
committer | 2016-10-22 11:31:49 +0200 | |
commit | 23ad94073f4c2f7131fa0c95b6202f2f9027db41 (patch) | |
tree | 4f4e1e27a22ace8fea49b63030d4462db7cb68a1 /src/osd/modules/file | |
parent | 255bf78b316a9dc9e4c53a65143000471a6927d3 (diff) |
use standard types uintptr_t, char16_t and char32_t instead of FPTR, utf16_char, unicode_char (nw)
Diffstat (limited to 'src/osd/modules/file')
-rw-r--r-- | src/osd/modules/file/posixfile.cpp | 4 | ||||
-rw-r--r-- | src/osd/modules/file/stdfile.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/file/winfile.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/osd/modules/file/posixfile.cpp b/src/osd/modules/file/posixfile.cpp index 09ed0ac7984..940acef38d5 100644 --- a/src/osd/modules/file/posixfile.cpp +++ b/src/osd/modules/file/posixfile.cpp @@ -474,7 +474,7 @@ const char *osd_get_volume_name(int idx) // osd_is_valid_filename_char //============================================================ -bool osd_is_valid_filename_char(unicode_char uchar) +bool osd_is_valid_filename_char(char32_t uchar) { // The only one that's actually invalid is the slash // The other two are just problematic because they're the escape character and path separator @@ -494,7 +494,7 @@ bool osd_is_valid_filename_char(unicode_char uchar) // osd_is_valid_filepath_char //============================================================ -bool osd_is_valid_filepath_char(unicode_char uchar) +bool osd_is_valid_filepath_char(char32_t uchar) { // One could argue that colon should be in here too because it functions as path separator return uchar >= 0x20 diff --git a/src/osd/modules/file/stdfile.cpp b/src/osd/modules/file/stdfile.cpp index 92920bba495..74cd6abc0c3 100644 --- a/src/osd/modules/file/stdfile.cpp +++ b/src/osd/modules/file/stdfile.cpp @@ -179,7 +179,7 @@ int osd_get_physical_drive_geometry(const char *filename, UINT32 *cylinders, UIN // osd_uchar_from_osdchar //============================================================ -int osd_uchar_from_osdchar(UINT32 /* unicode_char */ *uchar, const char *osdchar, size_t count) +int osd_uchar_from_osdchar(char32_t *uchar, const char *osdchar, size_t count) { // we assume a standard 1:1 mapping of characters to the first 256 unicode characters *uchar = (UINT8)*osdchar; diff --git a/src/osd/modules/file/winfile.cpp b/src/osd/modules/file/winfile.cpp index 656ce36eadc..3d61374e8c8 100644 --- a/src/osd/modules/file/winfile.cpp +++ b/src/osd/modules/file/winfile.cpp @@ -434,7 +434,7 @@ const char *osd_get_volume_name(int idx) // osd_is_valid_filename_char //============================================================ -bool osd_is_valid_filename_char(unicode_char uchar) +bool osd_is_valid_filename_char(char32_t uchar) { return osd_is_valid_filepath_char(uchar) && uchar != '/' @@ -448,7 +448,7 @@ bool osd_is_valid_filename_char(unicode_char uchar) // osd_is_valid_filepath_char //============================================================ -bool osd_is_valid_filepath_char(unicode_char uchar) +bool osd_is_valid_filepath_char(char32_t uchar) { return uchar >= 0x20 && uchar != '<' |