mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-23 09:58:19 -07:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'upstream/master' into feature/ich2

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-02-03 06:42:00 -05:00
parent 84d6cc0547 77673bd0fd
commit c954897760
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/flash.h
View File

@@ -11,8 +11,10 @@
*
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Jasmine Iwanek, <jriwanek@gmail.com>
*
* Copyright 2020 Miran Grca.
* Copyright 2020 Miran Grca.
* Copyright 2022-2023 Jasmine Iwanek.
*/
#ifndef EMU_FLASH_H

4
src/include/86box/plat_dir.h
View File

@@ -18,8 +18,8 @@
#ifndef PLAT_DIR_H
#define PLAT_DIR_H
/* Windows needs the POSIX re-implementations */
#if defined(_WIN32)
/* Windows and Termux needs the POSIX re-implementations */
#if defined(_WIN32) || defined(__TERMUX__)
# ifdef _MAX_FNAME
# define MAXNAMLEN _MAX_FNAME
# else

5
src/mem/sst_flash.c
View File

@@ -13,11 +13,12 @@
* Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Melissa Goad, <mszoopers@protonmail.com>
* Jasmine Iwanek, <jriwanek@gmail.com>
*
* Copyright 2008-2020 Sarah Walker.
* Copyright 2016-2020 Miran Grca.
* Copyright 2020 Melissa Goad.
* Copyright 2022 Jasmine Iwanek.
* Copyright 2020 Melissa Goad.
* Copyright 2022-2023 Jasmine Iwanek.
*/
#include <stdio.h>
#include <stdint.h>

6
src/unix/unix.c
View File

@@ -624,11 +624,11 @@ ui_msgbox_header(int flags, void *header, void *message)
SDL_MessageBoxData msgdata;
SDL_MessageBoxButtonData msgbtn;
if (!header)
header = (flags & MBX_ANSI) ? "86Box" : L"86Box";
header = (void *) (flags & MBX_ANSI) ? "86Box" : L"86Box";
if (header <= (void *) 7168)
header = plat_get_string(header);
header = (void *) plat_get_string((int) header);
if (message <= (void *) 7168)
message = plat_get_string(message);
message = (void *) plat_get_string((int) message);
msgbtn.buttonid = 1;
msgbtn.text = "OK";
msgbtn.flags = 0;