From 5ba1723512b62a8f663a2dd6ebc7b6386ea27ca5 Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Fri, 5 Aug 2016 15:46:00 +0100
Subject: [PATCH] Removed the juce_tracktion_marketplace module's dependency on
 juce_data_structures

---
 .../juce_tracktion_marketplace.cpp                       | 3 +++
 .../juce_tracktion_marketplace.h                         | 9 +++++++--
 .../marketplace/juce_OnlineUnlockStatus.cpp              | 3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/juce_tracktion_marketplace/juce_tracktion_marketplace.cpp b/modules/juce_tracktion_marketplace/juce_tracktion_marketplace.cpp
index 80c8c5f2d5..ee7d9911b8 100644
--- a/modules/juce_tracktion_marketplace/juce_tracktion_marketplace.cpp
+++ b/modules/juce_tracktion_marketplace/juce_tracktion_marketplace.cpp
@@ -36,7 +36,10 @@
 namespace juce
 {
     #include "marketplace/juce_OnlineUnlockStatus.cpp"
+
+   #if JUCE_MODULE_AVAILABLE_juce_data_structures
     #include "marketplace/juce_TracktionMarketplaceStatus.cpp"
+   #endif
 
    #if JUCE_MODULE_AVAILABLE_juce_gui_extra
     #include "marketplace/juce_OnlineUnlockForm.cpp"
diff --git a/modules/juce_tracktion_marketplace/juce_tracktion_marketplace.h b/modules/juce_tracktion_marketplace/juce_tracktion_marketplace.h
index e39c62541b..6fd50db445 100644
--- a/modules/juce_tracktion_marketplace/juce_tracktion_marketplace.h
+++ b/modules/juce_tracktion_marketplace/juce_tracktion_marketplace.h
@@ -39,7 +39,7 @@
   website:          http://www.juce.com/juce
   license:          GPL/Commercial
 
-  dependencies:     juce_data_structures juce_cryptography
+  dependencies:     juce_cryptography
 
  END_JUCE_MODULE_DECLARATION
 
@@ -62,7 +62,10 @@
 
 //==============================================================================
 #include <juce_cryptography/juce_cryptography.h>
-#include <juce_data_structures/juce_data_structures.h>
+
+#if JUCE_MODULE_AVAILABLE_juce_data_structures
+ #include <juce_data_structures/juce_data_structures.h>
+#endif
 
 #if JUCE_MODULE_AVAILABLE_juce_gui_extra
  #include <juce_gui_extra/juce_gui_extra.h>
@@ -70,8 +73,10 @@
 
 namespace juce
 {
+   #if JUCE_MODULE_AVAILABLE_juce_data_structures
     #include "marketplace/juce_OnlineUnlockStatus.h"
     #include "marketplace/juce_TracktionMarketplaceStatus.h"
+   #endif
     #include "marketplace/juce_KeyFileGeneration.h"
 
    #if JUCE_MODULE_AVAILABLE_juce_gui_extra
diff --git a/modules/juce_tracktion_marketplace/marketplace/juce_OnlineUnlockStatus.cpp b/modules/juce_tracktion_marketplace/marketplace/juce_OnlineUnlockStatus.cpp
index 0c12a6ab03..4ec731c100 100644
--- a/modules/juce_tracktion_marketplace/marketplace/juce_OnlineUnlockStatus.cpp
+++ b/modules/juce_tracktion_marketplace/marketplace/juce_OnlineUnlockStatus.cpp
@@ -176,6 +176,7 @@ struct KeyFileUtils
 };
 
 //==============================================================================
+#if JUCE_MODULE_AVAILABLE_juce_data_structures
 const char* OnlineUnlockStatus::unlockedProp = "u";
 const char* OnlineUnlockStatus::expiryTimeProp = "t";
 static const char* stateTagName = "REG";
@@ -458,6 +459,8 @@ OnlineUnlockStatus::UnlockResult OnlineUnlockStatus::attemptWebserverUnlock (con
     return handleFailedConnection();
 }
 
+#endif // JUCE_MODULE_AVAILABLE_juce_data_structures
+
 //==============================================================================
 String KeyGeneration::generateKeyFile (const String& appName,
                                        const String& userEmail,