From b8a6fcb1a727094ed590aab772e4bfb1929d46f0 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 29 Jan 2022 18:36:26 +0100 Subject: Android: Get rid of __cplusplus macro checks 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. --- Source/Android/jni/GameList/GameFileCache.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'Source/Android/jni/GameList/GameFileCache.cpp') diff --git a/Source/Android/jni/GameList/GameFileCache.cpp b/Source/Android/jni/GameList/GameFileCache.cpp index b79d85db15..061056cc90 100644 --- a/Source/Android/jni/GameList/GameFileCache.cpp +++ b/Source/Android/jni/GameList/GameFileCache.cpp @@ -11,20 +11,13 @@ #include "jni/AndroidCommon/IDCache.h" #include "jni/GameList/GameFile.h" -namespace UICommon -{ -class GameFile; -} - static UICommon::GameFileCache* GetPointer(JNIEnv* env, jobject obj) { return reinterpret_cast( env->GetLongField(obj, IDCache::GetGameFileCachePointer())); } -#ifdef __cplusplus extern "C" { -#endif JNIEXPORT jlong JNICALL 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(); } - -#ifdef __cplusplus } -#endif -- cgit v1.2.3