Merge pull request #10409 from JosJuice/android-no-cplusplus-checks

Android: Get rid of __cplusplus macro checks
dolphin-emu · Jan 30, 2022 · b32af33 · b32af33
2 parents a412223 + b8a6fcb
commit b32af33
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/Source/Android/jni/GameList/GameFile.cpp b/Source/Android/jni/GameList/GameFile.cpp
@@ -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))));
 }
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_finalize(JNIEnv* env,
                                                                               jobject obj)
@@ -201,7 +199,4 @@ JNIEXPORT jobject JNICALL Java_org_dolphinemu_dolphinemu_model_GameFile_parse(JN
 
   return GameFileToJava(env, game_file);
 }
-
-#ifdef __cplusplus
 }
-#endif
diff --git 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<UICommon::GameFileCache*>(
       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