Merge launcher branch

1 files changed, 7 insertions, 7 deletions

diff --git a/source/application/discord/activity_manager.cpp b/source/application/discord/activity_manager.cpp
index b9b6760..3c20074 100644
--- a/source/application/discord/activity_manager.cpp
+++ b/source/application/discord/activity_manager.cpp
@@ -13,7 +13,7 @@ namespace discord {
 
 class ActivityEvents final {
 public:
-    static void OnActivityJoin(void* callbackData, char const* secret)
+    static void DISCORD_CALLBACK OnActivityJoin(void* callbackData, char const* secret)
     {
         auto* core = reinterpret_cast<Core*>(callbackData);
         if (!core) {
@@ -24,7 +24,7 @@ public:
         module.OnActivityJoin(static_cast<const char*>(secret));
     }
 
-    static void OnActivitySpectate(void* callbackData, char const* secret)
+    static void DISCORD_CALLBACK OnActivitySpectate(void* callbackData, char const* secret)
     {
         auto* core = reinterpret_cast<Core*>(callbackData);
         if (!core) {
@@ -35,7 +35,7 @@ public:
         module.OnActivitySpectate(static_cast<const char*>(secret));
     }
 
-    static void OnActivityJoinRequest(void* callbackData, DiscordUser* user)
+    static void DISCORD_CALLBACK OnActivityJoinRequest(void* callbackData, DiscordUser* user)
     {
         auto* core = reinterpret_cast<Core*>(callbackData);
         if (!core) {
@@ -46,10 +46,10 @@ public:
         module.OnActivityJoinRequest(*reinterpret_cast<User const*>(user));
     }
 
-    static void OnActivityInvite(void* callbackData,
-                                 EDiscordActivityActionType type,
-                                 DiscordUser* user,
-                                 DiscordActivity* activity)
+    static void DISCORD_CALLBACK OnActivityInvite(void* callbackData,
+                                                  EDiscordActivityActionType type,
+                                                  DiscordUser* user,
+                                                  DiscordActivity* activity)
     {
         auto* core = reinterpret_cast<Core*>(callbackData);
         if (!core) {