From b2ae412e26420dc853a8126cb7d28f56ec366e76 Mon Sep 17 00:00:00 2001 From: hogliux Date: Fri, 18 Aug 2017 09:17:16 +0100 Subject: [PATCH] Android: Replaced jni type in JUCE header with generic void* to avoid compilation errors if the user does not include jni.h --- modules/juce_gui_basics/native/juce_android_Windowing.cpp | 2 +- .../in_app_purchases/juce_InAppPurchases.h | 2 +- .../native/juce_android_InAppPurchases.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/juce_gui_basics/native/juce_android_Windowing.cpp b/modules/juce_gui_basics/native/juce_android_Windowing.cpp index 599ec8c3a2..f6970feacb 100644 --- a/modules/juce_gui_basics/native/juce_android_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_android_Windowing.cpp @@ -33,7 +33,7 @@ namespace juce //============================================================================== #if JUCE_MODULE_AVAILABLE_juce_product_unlocking - extern void juce_inAppPurchaseCompleted (jobject intentData); + extern void juce_inAppPurchaseCompleted (void*); #endif //============================================================================== diff --git a/modules/juce_product_unlocking/in_app_purchases/juce_InAppPurchases.h b/modules/juce_product_unlocking/in_app_purchases/juce_InAppPurchases.h index dda6d16ac0..be49f7e2d4 100644 --- a/modules/juce_product_unlocking/in_app_purchases/juce_InAppPurchases.h +++ b/modules/juce_product_unlocking/in_app_purchases/juce_InAppPurchases.h @@ -259,7 +259,7 @@ private: ListenerList listeners; #if JUCE_ANDROID - friend void juce_inAppPurchaseCompleted (jobject); + friend void juce_inAppPurchaseCompleted (void*); #endif struct Pimpl; diff --git a/modules/juce_product_unlocking/native/juce_android_InAppPurchases.cpp b/modules/juce_product_unlocking/native/juce_android_InAppPurchases.cpp index 3611c9c3f3..f9d4a25d20 100644 --- a/modules/juce_product_unlocking/native/juce_android_InAppPurchases.cpp +++ b/modules/juce_product_unlocking/native/juce_android_InAppPurchases.cpp @@ -927,7 +927,7 @@ struct InAppPurchases::Pimpl : private AsyncUpdater, //============================================================================== -void juce_inAppPurchaseCompleted (jobject intentData) +void juce_inAppPurchaseCompleted (void* intentData) { - InAppPurchases::Pimpl::inAppPurchaseCompleted (intentData); + InAppPurchases::Pimpl::inAppPurchaseCompleted (static_cast (intentData)); }