Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cebix/macemu

This commit is contained in:
Alexei Svitkine 2017-12-02 11:36:45 -05:00
parent c9717bf331 a1a48c1479
commit 1503c84266
13 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BasiliskII/src/Unix/user_strings_unix.cpp
View File

@ -84,8 +84,6 @@ user_string_def platform_strings[] = {
{STR_IGNORESEGV_CTRL, "Ignore Illegal Memory Accesses"},
{STR_WINDOW_TITLE_GRABBED, "Basilisk II (mouse grabbed, press Ctrl-F5 to release)"},
{STR_NO_B2_EXE_FOUND, "Could not start %s (%s)."},
{-1, NULL} // End marker

2
BasiliskII/src/Unix/user_strings_unix.h
View File

@ -75,8 +75,6 @@ enum {
STR_IGNORESEGV_CTRL,
STR_WINDOW_TITLE_GRABBED,
STR_NO_B2_EXE_FOUND
};

1
BasiliskII/src/Windows/user_strings_windows.cpp
View File

@ -37,7 +37,6 @@ user_string_def platform_strings[] = {
{STR_NO_AUDIO_WARN, "No audio device found, audio output will be disabled."},
{STR_KEYCODE_FILE_WARN, "Cannot open keycode translation file %s (%s)."},
{STR_KEYCODE_VENDOR_WARN, "Cannot find vendor '%s' in keycode translation file %s."},
{STR_WINDOW_TITLE_GRABBED, "Basilisk II (mouse grabbed, press Ctrl-F5 to release)"},
{STR_NO_WIN32_NT_4, "Basilisk II does not run on Windows NT versions less than 4.0"},
{STR_PREFS_MENU_FILE_GTK, "/_File"},

1
BasiliskII/src/Windows/user_strings_windows.h
View File

@ -39,7 +39,6 @@ enum {
STR_NO_AUDIO_WARN,
STR_KEYCODE_FILE_WARN,
STR_KEYCODE_VENDOR_WARN,
STR_WINDOW_TITLE_GRABBED,
STR_NO_WIN32_NT_4,
STR_PREFS_MENU_FILE_GTK,

6
BasiliskII/src/extfs.cpp
View File

@ -175,9 +175,9 @@ static uint32 next_cnid = fsUsrCNID; // Next available CNID
#if defined __APPLE__ && defined __MACH__
struct crtimebuf {
unsigned long length;
struct timespec crtime;
};
u_int32_t length;
struct timespec crtime;
} __attribute__((aligned(4), packed));
static uint32 do_get_creation_time(const char *path)
{

1
BasiliskII/src/include/user_strings.h
View File

@ -213,6 +213,7 @@ enum {
// Mac window
STR_WINDOW_TITLE = 4000,
STR_WINDOW_TITLE_FROZEN,
STR_WINDOW_TITLE_GRABBED,
STR_WINDOW_MENU = 4050,
STR_WINDOW_ITEM_ABOUT,
STR_WINDOW_ITEM_REFRESH,

1
BasiliskII/src/user_strings.cpp
View File

@ -226,6 +226,7 @@ user_string_def common_strings[] = {
{STR_WINDOW_TITLE, "Basilisk II"},
{STR_WINDOW_TITLE_FROZEN, "Basilisk II *** FROZEN ***"},
{STR_WINDOW_TITLE_GRABBED, "Basilisk II (mouse grabbed, press Ctrl-F5 to release)"},
{STR_WINDOW_MENU, "Basilisk II"},
{STR_WINDOW_ITEM_ABOUT, "About Basilisk II" ELLIPSIS},
{STR_WINDOW_ITEM_REFRESH, "Refresh Rate"},

1
SheepShaver/src/Unix/user_strings_unix.cpp
View File

@ -84,7 +84,6 @@ user_string_def platform_strings[] = {
{STR_VOSF_INIT_ERR, "Cannot initialize Video on SEGV signals."},
{STR_OPEN_WINDOW_ERR, "Cannot open Mac window."},
{STR_WINDOW_TITLE_GRABBED, "SheepShaver (mouse grabbed, press Ctrl-F5 to release)"},
{STR_NO_B2_EXE_FOUND, "Could not start %s (%s)."},

5
SheepShaver/src/Unix/user_strings_unix.h
View File

@ -18,8 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef USER_STRINGS_LINUX_H
#define USER_STRINGS_LINUX_H
#ifndef USER_STRINGS_UNIX_H
#define USER_STRINGS_UNIX_H
enum {
STR_NO_DEV_ZERO_ERR = 10000,
@ -78,7 +78,6 @@ enum {
STR_MOUSEWHEELLINES_CTRL,
STR_OPEN_WINDOW_ERR,
STR_WINDOW_TITLE_GRABBED,
STR_NO_B2_EXE_FOUND
};

1
SheepShaver/src/Windows/user_strings_windows.cpp
View File

@ -45,7 +45,6 @@ user_string_def platform_strings[] = {
{STR_VOSF_INIT_ERR, "Cannot initialize Video on SEGV signals."},
{STR_OPEN_WINDOW_ERR, "Cannot open Mac window."},
{STR_WINDOW_TITLE_GRABBED, "SheepShaver (mouse grabbed, press Ctrl-F5 to release)"},
{STR_NO_WIN32_NT_4, "SheepShaver does not run on Windows NT versions less than 4.0"},
{STR_PREFS_MENU_FILE_GTK, "/_File"},

1
SheepShaver/src/Windows/user_strings_windows.h
View File

@ -39,7 +39,6 @@ enum {
STR_KEYCODE_FILE_WARN,
STR_KEYCODE_VENDOR_WARN,
STR_OPEN_WINDOW_ERR,
STR_WINDOW_TITLE_GRABBED,
STR_NO_WIN32_NT_4,
STR_PREFS_MENU_FILE_GTK,

1
SheepShaver/src/include/user_strings.h
View File

@ -166,6 +166,7 @@ enum {
// Mac window
STR_WINDOW_TITLE = 4000,
STR_WINDOW_TITLE_FROZEN,
STR_WINDOW_TITLE_GRABBED,
STR_WINDOW_MENU = 4050,
STR_WINDOW_ITEM_ABOUT,
STR_WINDOW_ITEM_REFRESH,

1
SheepShaver/src/user_strings.cpp
View File

@ -172,6 +172,7 @@ user_string_def common_strings[] = {
{STR_WINDOW_TITLE, "SheepShaver"},
{STR_WINDOW_TITLE_FROZEN, "SheepShaver *** FROZEN ***"},
{STR_WINDOW_TITLE_GRABBED, "SheepShaver (mouse grabbed, press Ctrl-F5 to release)"},
{STR_WINDOW_MENU, "SheepShaver"},
{STR_WINDOW_ITEM_ABOUT, "About SheepShaver" ELLIPSIS},
{STR_WINDOW_ITEM_REFRESH, "Refresh Rate"},