zdoom/zmusic
0
0
Fork 0
mirror of https://github.com/ZDoom/ZMusic.git synced 2024-11-30 07:31:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- zmusic.h is now usable with GCC/Clang and C++98

Browse source
This commit is contained in:
alexey.lysiuk 2020-01-04 17:12:52 +02:00
parent 915335ae97
commit 8e66bb2df8
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/zmusic.h
View file

@ -233,7 +233,11 @@ struct Callbacks
#ifndef ZMUSIC_INTERNAL #ifndef ZMUSIC_INTERNAL
#ifdef _MSC_VER
#define DLL_IMPORT _declspec(dllimport) #define DLL_IMPORT _declspec(dllimport)
#else // !_MSC_VER
#define DLL_IMPORT
#endif // _MSC_VER
// Note that the internal 'class' definitions are not C compatible! // Note that the internal 'class' definitions are not C compatible!
typedef struct { int zm1; } *ZMusic_MidiSource; typedef struct { int zm1; } *ZMusic_MidiSource;
typedef struct { int zm2; } *ZMusic_MusicStream; typedef struct { int zm2; } *ZMusic_MusicStream;
@ -299,11 +303,11 @@ extern "C"
#ifdef __cplusplus #ifdef __cplusplus
} }
inline bool ChangeMusicSetting(EIntConfigKey key, ZMusic_MusicStream song, int value, int* pRealValue = nullptr) inline bool ChangeMusicSetting(EIntConfigKey key, ZMusic_MusicStream song, int value, int* pRealValue = NULL)
{ {
return ChangeMusicSettingInt(key, song, value, pRealValue); return ChangeMusicSettingInt(key, song, value, pRealValue);
} }
inline bool ChangeMusicSetting(EFloatConfigKey key, ZMusic_MusicStream song, float value, float* pRealValue = nullptr) inline bool ChangeMusicSetting(EFloatConfigKey key, ZMusic_MusicStream song, float value, float* pRealValue = NULL)
{ {
return ChangeMusicSettingFloat(key, song, value, pRealValue); return ChangeMusicSettingFloat(key, song, value, pRealValue);
} }