Browse Source

Android: Replaced jni type in JUCE header with generic void* to avoid compilation errors if the user does not include jni.h

tags/2021-05-28
hogliux 8 years ago
parent
commit
b2ae412e26
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      modules/juce_gui_basics/native/juce_android_Windowing.cpp
  2. +1
    -1
      modules/juce_product_unlocking/in_app_purchases/juce_InAppPurchases.h
  3. +2
    -2
      modules/juce_product_unlocking/native/juce_android_InAppPurchases.cpp

+ 1
- 1
modules/juce_gui_basics/native/juce_android_Windowing.cpp View File

@@ -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
//==============================================================================


+ 1
- 1
modules/juce_product_unlocking/in_app_purchases/juce_InAppPurchases.h View File

@@ -259,7 +259,7 @@ private:
ListenerList<Listener> listeners;
#if JUCE_ANDROID
friend void juce_inAppPurchaseCompleted (jobject);
friend void juce_inAppPurchaseCompleted (void*);
#endif
struct Pimpl;


+ 2
- 2
modules/juce_product_unlocking/native/juce_android_InAppPurchases.cpp View File

@@ -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<jobject> (intentData));
}

Loading…
Cancel
Save