diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-02 21:29:06 -0500 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2020-05-02 21:29:06 -0500 |
| commit | bbdad2a40d8f02fe738830d9cf66ad4ec2fa86cf (patch) | |
| tree | 8e8892d24684f005b0e18624677957791e1738b7 /include/discord_register.h | |
| parent | 1e2d71fb96ca85fa50c172c2f1cf22b2620bacd2 (diff) | |
| parent | 992c0b14e155059a7e22ad72c0309b620c850a46 (diff) | |
Merge branch '2.7-rc'
Includes full code reformat.
# Conflicts:
# src/aomusicplayer.cpp
# src/path_functions.cpp
Diffstat (limited to 'include/discord_register.h')
| -rw-r--r-- | include/discord_register.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/include/discord_register.h b/include/discord_register.h index 4c16b68..655a3df 100644 --- a/include/discord_register.h +++ b/include/discord_register.h @@ -1,25 +1,27 @@ #pragma once #if defined(DISCORD_DYNAMIC_LIB) -# if defined(_WIN32) -# if defined(DISCORD_BUILDING_SDK) -# define DISCORD_EXPORT __declspec(dllexport) -# else -# define DISCORD_EXPORT __declspec(dllimport) -# endif -# else -# define DISCORD_EXPORT __attribute__((visibility("default"))) -# endif +#if defined(_WIN32) +#if defined(DISCORD_BUILDING_SDK) +#define DISCORD_EXPORT __declspec(dllexport) #else -# define DISCORD_EXPORT +#define DISCORD_EXPORT __declspec(dllimport) +#endif +#else +#define DISCORD_EXPORT __attribute__((visibility("default"))) +#endif +#else +#define DISCORD_EXPORT #endif #ifdef __cplusplus extern "C" { #endif -DISCORD_EXPORT void Discord_Register(const char* applicationId, const char* command); -DISCORD_EXPORT void Discord_RegisterSteamGame(const char* applicationId, const char* steamId); +DISCORD_EXPORT void Discord_Register(const char *applicationId, + const char *command); +DISCORD_EXPORT void Discord_RegisterSteamGame(const char *applicationId, + const char *steamId); #ifdef __cplusplus } |