summaryrefslogtreecommitdiff
path: root/Source/Android
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2021-03-03 23:01:14 +0100
committerJosJuice <josjuice@gmail.com>2021-03-04 22:47:23 +0100
commitd99d72f5a6bdd3b3b8b3b09f4bdf3997ec02e3cb (patch)
tree4722f665ed5ba76e9df3c7ca15e8c1245a8d8b0a /Source/Android
parentae5f8853a40275948f7c53927a2de31e11320094 (diff)
Android: Remove #ifdef __cplusplus checks
A C compiler would very much be unable to build this code anyway.
Diffstat (limited to 'Source/Android')
-rw-r--r--Source/Android/jni/AndroidCommon/IDCache.cpp9
-rw-r--r--Source/Android/jni/IniFile.cpp5
-rw-r--r--Source/Android/jni/MainAndroid.cpp5
-rw-r--r--Source/Android/jni/NativeConfig.cpp5
4 files changed, 2 insertions, 22 deletions
diff --git a/Source/Android/jni/AndroidCommon/IDCache.cpp b/Source/Android/jni/AndroidCommon/IDCache.cpp
index 488fa3782d..586ffd0845 100644
--- a/Source/Android/jni/AndroidCommon/IDCache.cpp
+++ b/Source/Android/jni/AndroidCommon/IDCache.cpp
@@ -271,11 +271,9 @@ jmethodID GetBooleanSupplierGet()
} // namespace IDCache
-#ifdef __cplusplus
extern "C" {
-#endif
-jint JNI_OnLoad(JavaVM* vm, void* reserved)
+JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
{
s_java_vm = vm;
@@ -382,7 +380,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
return JNI_VERSION;
}
-void JNI_OnUnload(JavaVM* vm, void* reserved)
+JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved)
{
JNIEnv* env;
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_boolean_supplier_class);
}
-
-#ifdef __cplusplus
}
-#endif
diff --git a/Source/Android/jni/IniFile.cpp b/Source/Android/jni/IniFile.cpp
index e78d8b78f2..97482ef3f3 100644
--- a/Source/Android/jni/IniFile.cpp
+++ b/Source/Android/jni/IniFile.cpp
@@ -60,9 +60,7 @@ static void Set(JNIEnv* env, jobject obj, jstring section_name, jstring key, T n
->Set(GetJString(env, key), new_value);
}
-#ifdef __cplusplus
extern "C" {
-#endif
JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_utils_IniFile_00024Section_exists(
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)));
}
-
-#ifdef __cplusplus
}
-#endif
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
index 1290f586fb..6542109949 100644
--- a/Source/Android/jni/MainAndroid.cpp
+++ b/Source/Android/jni/MainAndroid.cpp
@@ -196,9 +196,7 @@ static std::string GetAnalyticValue(const std::string& key)
return stdvalue;
}
-#ifdef __cplusplus
extern "C" {
-#endif
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_UnPauseEmulation(JNIEnv*,
jclass)
@@ -703,7 +701,4 @@ Java_org_dolphinemu_dolphinemu_NativeLibrary_GetCurrentTitleDescriptionUnchecked
return ToJString(env, description);
}
-
-#ifdef __cplusplus
}
-#endif
diff --git a/Source/Android/jni/NativeConfig.cpp b/Source/Android/jni/NativeConfig.cpp
index 270a999d0c..31fe9ade9a 100644
--- a/Source/Android/jni/NativeConfig.cpp
+++ b/Source/Android/jni/NativeConfig.cpp
@@ -94,9 +94,7 @@ static void Set(jint layer, const Config::Location& location, T value)
Config::OnConfigChanged();
}
-#ifdef __cplusplus
extern "C" {
-#endif
JNIEXPORT jboolean JNICALL
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);
}
-
-#ifdef __cplusplus
}
-#endif