mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-01 00:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1884 from daveshah1/master

Browse Source 
Two Android Fixes
This commit is contained in:
Twinaphex 2015-07-02 16:17:18 +02:00
commit 1d7c1ec23b
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
input/drivers/android_input.c
View File

@ -278,11 +278,7 @@ static bool android_input_lookup_name(char *buf,
goto error;
CALL_INT_METHOD(env, *vendorId, device, getVendorId);
if (!*vendorId)
{
RARCH_ERR("Failed to find vendor id for device ID: %d\n", id);
goto error;
}
RARCH_LOG("device vendor id: %d\n", *vendorId);
getProductId = NULL;
@ -292,11 +288,7 @@ static bool android_input_lookup_name(char *buf,
*productId = 0;
CALL_INT_METHOD(env, *productId, device, getProductId);
if (!*productId)
{
RARCH_ERR("Failed to find product id for device ID: %d\n", id);
goto error;
}
RARCH_LOG("device product id: %d\n", *productId);
return true;

2
libretro-common/include/retro_log.h
View File

@ -65,7 +65,7 @@ FILE *rarch_main_log_file(void);
#define PROGRAM_NAME "N/A"
#endif
#if defined(RARCH_INTERNAL)
#if defined(RARCH_INTERNAL) && !defined(ANDROID)
#ifdef __cplusplus
extern "C" {