--- BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp 1999/10/19 19:28:16 1.2 +++ BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp 1999/10/25 19:01:32 1.4 @@ -142,7 +142,11 @@ static void read_settings(struct LayoutH * Locale hook - returns string for given ID */ +#ifdef __GNUC__ +static __saveds __attribute__((regparm(3))) const char *locale_hook_func(struct Hook *hook /*a0*/, void *id /*a1*/, struct LayoutHandle *h /*a2*/) +#else static __saveds __regargs const char *locale_hook_func(struct Hook *hook /*a0*/, void *id /*a1*/, struct LayoutHandle *h /*a2*/) +#endif { return GetString((uint32)id); } @@ -1067,7 +1071,7 @@ static void read_scsi_settings(void) if (strlen(scsi_dev[i])) { char str[256]; - sprintf("%s/%ld", scsi_dev[i], scsi_unit[i]); + sprintf(str, "%s/%ld", scsi_dev[i], scsi_unit[i]); PrefsReplaceString(prefs_name, str); } else PrefsRemoveItem(prefs_name);