diff options
| author | Chris Robinson <[email protected]> | 2022-03-31 05:20:16 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2022-03-31 05:20:16 -0700 |
| commit | d91b68ef8ee57bcda7cda37a374e984a1a4245b3 (patch) | |
| tree | af69bf32819fe65089060ea0e10a76d921856972 | |
| parent | abfb584f1493b6295093a73235f1cea77ec15575 (diff) | |
Avoid some explicit extern "C"s on function definitions
| -rw-r--r-- | al/source.cpp | 2 | ||||
| -rw-r--r-- | al/state.cpp | 6 | ||||
| -rw-r--r-- | alc/inprogext.h | 12 |
3 files changed, 16 insertions, 4 deletions
diff --git a/al/source.cpp b/al/source.cpp index dee4af2a..d2ccfe08 100644 --- a/al/source.cpp +++ b/al/source.cpp @@ -3580,7 +3580,7 @@ START_API_FUNC END_API_FUNC -extern "C" AL_API void AL_APIENTRY alSourceQueueBufferLayersSOFT(ALuint, ALsizei, const ALuint*) +AL_API void AL_APIENTRY alSourceQueueBufferLayersSOFT(ALuint, ALsizei, const ALuint*) START_API_FUNC { ContextRef context{GetContextRef()}; diff --git a/al/state.cpp b/al/state.cpp index 26fbd5b3..8142890e 100644 --- a/al/state.cpp +++ b/al/state.cpp @@ -137,7 +137,7 @@ ALenum ALenumFromDistanceModel(DistanceModel model) /* WARNING: Non-standard export! Not part of any extension, or exposed in the * alcFunctions list. */ -extern "C" AL_API const ALchar* AL_APIENTRY alsoft_get_version(void) +AL_API const ALchar* AL_APIENTRY alsoft_get_version(void) START_API_FUNC { static const auto spoof = al::getenv("ALSOFT_SPOOF_VERSION"); @@ -477,7 +477,7 @@ START_API_FUNC } END_API_FUNC -extern "C" AL_API ALint64SOFT AL_APIENTRY alGetInteger64SOFT(ALenum pname) +AL_API ALint64SOFT AL_APIENTRY alGetInteger64SOFT(ALenum pname) START_API_FUNC { ContextRef context{GetContextRef()}; @@ -686,7 +686,7 @@ START_API_FUNC } END_API_FUNC -extern "C" AL_API void AL_APIENTRY alGetInteger64vSOFT(ALenum pname, ALint64SOFT *values) +AL_API void AL_APIENTRY alGetInteger64vSOFT(ALenum pname, ALint64SOFT *values) START_API_FUNC { if(values) diff --git a/alc/inprogext.h b/alc/inprogext.h index 95d37461..bf2a0849 100644 --- a/alc/inprogext.h +++ b/alc/inprogext.h @@ -114,6 +114,18 @@ ALCboolean ALC_APIENTRY alcReopenDeviceSOFT(ALCdevice *device, const ALCchar *de /*#define ALC_7POINT1_SOFT 0x1506*/ #endif + +/* Non-standard export. Not part of any extension. */ +AL_API const ALchar* AL_APIENTRY alsoft_get_version(void); + + +/* Functions from abandoned extenions. */ +AL_API void AL_APIENTRY alSourceQueueBufferLayersSOFT(ALuint src, ALsizei nb, + const ALuint *buffers); + +AL_API ALint64SOFT AL_APIENTRY alGetInteger64SOFT(ALenum pname); +AL_API void AL_APIENTRY alGetInteger64vSOFT(ALenum pname, ALint64SOFT *values); + #ifdef __cplusplus } /* extern "C" */ #endif |