piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Remove #ifdef __cplusplus checks

Browse Source 
A C compiler would very much be unable to build this code anyway.
This commit is contained in:
JosJuice 2021-03-03 23:01:14 +01:00
parent ae5f8853a4
commit d99d72f5a6
4 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Android/jni/AndroidCommon/IDCache.cpp
View File

@ -271,11 +271,9 @@ jmethodID GetBooleanSupplierGet()
} // namespace IDCache } // namespace IDCache
#ifdef __cplusplus
extern "C" { extern "C" {
#endif
jint JNI_OnLoad(JavaVM* vm, void* reserved) JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
{ {
s_java_vm = vm; s_java_vm = vm;
@ -382,7 +380,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
return JNI_VERSION; return JNI_VERSION;
} }
void JNI_OnUnload(JavaVM* vm, void* reserved) JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved)
{ {
JNIEnv* env; JNIEnv* env;
if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION) != JNI_OK) if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION) != JNI_OK)
@ -400,7 +398,4 @@ void JNI_OnUnload(JavaVM* vm, void* reserved)
env->DeleteGlobalRef(s_network_helper_class); env->DeleteGlobalRef(s_network_helper_class);
env->DeleteGlobalRef(s_boolean_supplier_class); env->DeleteGlobalRef(s_boolean_supplier_class);
} }
#ifdef __cplusplus
} }
#endif

5
Source/Android/jni/IniFile.cpp
View File

@ -60,9 +60,7 @@ static void Set(JNIEnv* env, jobject obj, jstring section_name, jstring key, T n
->Set(GetJString(env, key), new_value); ->Set(GetJString(env, key), new_value);
} }
#ifdef __cplusplus
extern "C" { extern "C" {
#endif
JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_utils_IniFile_00024Section_exists( JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_utils_IniFile_00024Section_exists(
JNIEnv* env, jobject obj, jstring key) JNIEnv* env, jobject obj, jstring key)
@ -243,7 +241,4 @@ JNIEXPORT jlong JNICALL Java_org_dolphinemu_dolphinemu_utils_IniFile_copyIniFile
{ {
return reinterpret_cast<jlong>(new IniFile(*GetIniFilePointer(env, other))); return reinterpret_cast<jlong>(new IniFile(*GetIniFilePointer(env, other)));
} }
#ifdef __cplusplus
} }
#endif

5
Source/Android/jni/MainAndroid.cpp
View File

@ -196,9 +196,7 @@ static std::string GetAnalyticValue(const std::string& key)
return stdvalue; return stdvalue;
} }
#ifdef __cplusplus
extern "C" { extern "C" {
#endif
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_UnPauseEmulation(JNIEnv*, JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_UnPauseEmulation(JNIEnv*,
jclass) jclass)
@ -703,7 +701,4 @@ Java_org_dolphinemu_dolphinemu_NativeLibrary_GetCurrentTitleDescriptionUnchecked
return ToJString(env, description); return ToJString(env, description);
} }
#ifdef __cplusplus
} }
#endif

5
Source/Android/jni/NativeConfig.cpp
View File

@ -94,9 +94,7 @@ static void Set(jint layer, const Config::Location& location, T value)
Config::OnConfigChanged(); Config::OnConfigChanged();
} }
#ifdef __cplusplus
extern "C" { extern "C" {
#endif
JNIEXPORT jboolean JNICALL JNIEXPORT jboolean JNICALL
Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_isSettingSaveable( Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_isSettingSaveable(
@ -210,7 +208,4 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_Na
{ {
return Set(layer, GetLocation(env, file, section, key), value); return Set(layer, GetLocation(env, file, section, key), value);
} }
#ifdef __cplusplus
} }
#endif