The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Android: Get rid of __cplusplus macro checks

Browse Source 
These files cannot compile correctly as C, so there's no reason to have
ifdefs for C compatibility.

We switched to not checking the __cplusplus macro in our JNI code some
time ago, but it seems like I forgot to remove it from these two files.
This commit is contained in:
JosJuice 2022-01-29 18:36:26 +01:00
parent af5678ea75
commit b8a6fcb1a7
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Android/jni/GameList/GameFile.cpp
View File

@ -36,9 +36,7 @@ jobject GameFileToJava(JNIEnv* env, std::shared_ptr<const UICommon::GameFile> ga
reinterpret_cast<jlong>(new std::shared_ptr<const UICommon::GameFile>(std::move(game_file)))); reinterpret_cast<jlong>(new std::shared_ptr<const UICommon::GameFile>(std::move(game_file))));
} }
#ifdef __cplusplus
extern "C" { extern "C" {
#endif
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_finalize(JNIEnv* env, JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_finalize(JNIEnv* env,
jobject obj) jobject obj)
@ -201,7 +199,4 @@ JNIEXPORT jobject JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_parse(JN
return GameFileToJava(env, game_file); return GameFileToJava(env, game_file);
} }
#ifdef __cplusplus
} }
#endif

10
Source/Android/jni/GameList/GameFileCache.cpp
View File

@ -11,20 +11,13 @@
#include "jni/AndroidCommon/IDCache.h" #include "jni/AndroidCommon/IDCache.h"
#include "jni/GameList/GameFile.h" #include "jni/GameList/GameFile.h"
namespace UICommon
{
class GameFile;
}
static UICommon::GameFileCache* GetPointer(JNIEnv* env, jobject obj) static UICommon::GameFileCache* GetPointer(JNIEnv* env, jobject obj)
{ {
return reinterpret_cast<UICommon::GameFileCache*>( return reinterpret_cast<UICommon::GameFileCache*>(
env->GetLongField(obj, IDCache::GetGameFileCachePointer())); env->GetLongField(obj, IDCache::GetGameFileCachePointer()));
} }
#ifdef __cplusplus
extern "C" { extern "C" {
#endif
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_org_dolphinemu_dolphinemu_model_GameFileCache_newGameFileCache(JNIEnv* env, jclass) Java_org_dolphinemu_dolphinemu_model_GameFileCache_newGameFileCache(JNIEnv* env, jclass)
@ -96,7 +89,4 @@ JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_sa
{ {
return GetPointer(env, obj)->Save(); return GetPointer(env, obj)->Save();
} }
#ifdef __cplusplus
} }
#endif