ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(iOS) Buildfix and cleanup some unused variables

This commit is contained in:
reallibretroadmin 2023-01-09 01:54:45 +01:00
parent f0656f10de
commit 3ae8e35d0e
5 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration.c
View File

@ -2491,7 +2491,7 @@ static void video_driver_default_settings(global_t *global)
**/ **/
void config_set_defaults(void *data) void config_set_defaults(void *data)
{ {
unsigned i, j; int i;
#ifdef HAVE_MENU #ifdef HAVE_MENU
static bool first_initialized = true; static bool first_initialized = true;
#endif #endif

2
frontend/drivers/platform_darwin.m
View File

@ -373,7 +373,7 @@ static void frontend_darwin_get_env(int *argc, char *argv[],
if (realpath(bundle_path_buf, resolved_bundle_dir_buf)) if (realpath(bundle_path_buf, resolved_bundle_dir_buf))
strlcpy(bundle_path_buf, strlcpy(bundle_path_buf,
resolved_bundle_dir_buf, resolved_bundle_dir_buf,
sizeof(bundle_path_buf); sizeof(bundle_path_buf));
#endif #endif
strlcat(home_dir_buf, "/RetroArch", sizeof(home_dir_buf)); strlcat(home_dir_buf, "/RetroArch", sizeof(home_dir_buf));

1
input/drivers_hid/btstack_hid.c
View File

@ -1409,7 +1409,6 @@ static int16_t btstack_hid_joypad_state(
unsigned i; unsigned i;
int16_t ret = 0; int16_t ret = 0;
const struct retro_keybind *binds = (const struct retro_keybind*)binds_data; const struct retro_keybind *binds = (const struct retro_keybind*)binds_data;
btstack_hid_t *hid = (btstack_hid_t*)data;
uint16_t port_idx = joypad_info->joy_idx; uint16_t port_idx = joypad_info->joy_idx;
joypad_connection_t *pad = &slots[port_idx]; joypad_connection_t *pad = &slots[port_idx];

7
ui/drivers/cocoa/cocoa_common.m
View File

@ -231,13 +231,6 @@ void *glkitview_init(void);
- (void)viewWillLayoutSubviews - (void)viewWillLayoutSubviews
{ {
RAScreen *screen = (BRIDGE RAScreen*)cocoa_screen_get_chosen();
CGRect screenSize = [screen bounds];
SEL selector = NSSelectorFromString(BOXSTRING("coordinateSpace"));
if ([screen respondsToSelector:selector])
screenSize = [[screen coordinateSpace] bounds];
[self adjustViewFrameForSafeArea]; [self adjustViewFrameForSafeArea];
#ifdef HAVE_IOS_CUSTOMKEYBOARD #ifdef HAVE_IOS_CUSTOMKEYBOARD
[self.view bringSubviewToFront:self.keyboardController.view]; [self.view bringSubviewToFront:self.keyboardController.view];

5
verbosity.c
View File

@ -213,7 +213,6 @@ void retro_main_log_file_deinit(void)
#if !defined(HAVE_LOGGER) #if !defined(HAVE_LOGGER)
void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap) void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
{ {
verbosity_state_t *g_verbosity = &main_verbosity_st;
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
#if TARGET_IPHONE_SIMULATOR #if TARGET_IPHONE_SIMULATOR
vprintf(fmt, ap); vprintf(fmt, ap);
@ -247,6 +246,7 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
wvsprintf(buffer, msg_new, ap); wvsprintf(buffer, msg_new, ap);
OutputDebugStringA(buffer); OutputDebugStringA(buffer);
#elif defined(ANDROID) #elif defined(ANDROID)
verbosity_state_t *g_verbosity = &main_verbosity_st;
int prio = ANDROID_LOG_INFO; int prio = ANDROID_LOG_INFO;
if (tag) if (tag)
{ {
@ -264,6 +264,7 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
else else
__android_log_vprint(prio, FILE_PATH_PROGRAM_NAME, fmt, ap); __android_log_vprint(prio, FILE_PATH_PROGRAM_NAME, fmt, ap);
#else #else
verbosity_state_t *g_verbosity = &main_verbosity_st;
FILE *fp = (FILE*)g_verbosity->fp; FILE *fp = (FILE*)g_verbosity->fp;
const char *tag_v = tag ? tag : FILE_PATH_LOG_INFO; const char *tag_v = tag ? tag : FILE_PATH_LOG_INFO;
#if defined(HAVE_QT) || defined(__WINRT__) #if defined(HAVE_QT) || defined(__WINRT__)
@ -273,7 +274,7 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
/* Ensure null termination and line break in error case */ /* Ensure null termination and line break in error case */
if (vsnprintf(buffer, sizeof(buffer), fmt, ap) < 0) if (vsnprintf(buffer, sizeof(buffer), fmt, ap) < 0)
{ {
int end; size_t end;
buffer[sizeof(buffer) - 1] = '\0'; buffer[sizeof(buffer) - 1] = '\0';
end = strlen(buffer) - 1; end = strlen(buffer) - 1;
if (end >= 0) if (end >= 0)