Don't use deprecated macros

11 files changed, 137 insertions, 137 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index dd9c1998..8434d429 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -670,7 +670,7 @@ static ALCvoid ExitContext(ALCcontext *pContext)
 
 
 // This should probably move to another c file but for now ...
-ALCAPI ALCdevice* ALCAPIENTRY alcCaptureOpenDevice(const ALCchar *deviceName, ALCuint frequency, ALCenum format, ALCsizei SampleSize)
+ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *deviceName, ALCuint frequency, ALCenum format, ALCsizei SampleSize)
 {
     ALCboolean DeviceFound = ALC_FALSE;
     ALCdevice *pDevice = NULL;
@@ -731,7 +731,7 @@ ALCAPI ALCdevice* ALCAPIENTRY alcCaptureOpenDevice(const ALCchar *deviceName, AL
     return pDevice;
 }
 
-ALCAPI ALCboolean ALCAPIENTRY alcCaptureCloseDevice(ALCdevice *pDevice)
+ALC_API ALCboolean ALC_APIENTRY alcCaptureCloseDevice(ALCdevice *pDevice)
 {
     ALCboolean bReturn = ALC_FALSE;
     ALCdevice **list;
@@ -764,7 +764,7 @@ ALCAPI ALCboolean ALCAPIENTRY alcCaptureCloseDevice(ALCdevice *pDevice)
     return bReturn;
 }
 
-ALCAPI void ALCAPIENTRY alcCaptureStart(ALCdevice *pDevice)
+ALC_API void ALC_APIENTRY alcCaptureStart(ALCdevice *pDevice)
 {
     if(IsDevice(pDevice) && pDevice->IsCaptureDevice)
     {
@@ -776,7 +776,7 @@ ALCAPI void ALCAPIENTRY alcCaptureStart(ALCdevice *pDevice)
         alcSetError(pDevice, ALC_INVALID_DEVICE);
 }
 
-ALCAPI void ALCAPIENTRY alcCaptureStop(ALCdevice *pDevice)
+ALC_API void ALC_APIENTRY alcCaptureStop(ALCdevice *pDevice)
 {
     if(IsDevice(pDevice) && pDevice->IsCaptureDevice)
     {
@@ -788,7 +788,7 @@ ALCAPI void ALCAPIENTRY alcCaptureStop(ALCdevice *pDevice)
         alcSetError(pDevice, ALC_INVALID_DEVICE);
 }
 
-ALCAPI void ALCAPIENTRY alcCaptureSamples(ALCdevice *pDevice, ALCvoid *pBuffer, ALCsizei lSamples)
+ALC_API void ALC_APIENTRY alcCaptureSamples(ALCdevice *pDevice, ALCvoid *pBuffer, ALCsizei lSamples)
 {
     if(IsDevice(pDevice) && pDevice->IsCaptureDevice)
     {
@@ -805,7 +805,7 @@ ALCAPI void ALCAPIENTRY alcCaptureSamples(ALCdevice *pDevice, ALCvoid *pBuffer,
 
     Return last ALC generated error code
 */
-ALCAPI ALCenum ALCAPIENTRY alcGetError(ALCdevice *device)
+ALC_API ALCenum ALC_APIENTRY alcGetError(ALCdevice *device)
 {
     ALCenum errorCode = ALC_NO_ERROR;
 
@@ -828,7 +828,7 @@ ALCAPI ALCenum ALCAPIENTRY alcGetError(ALCdevice *device)
 
     Not functional
 */
-ALCAPI ALCvoid ALCAPIENTRY alcSuspendContext(ALCcontext *pContext)
+ALC_API ALCvoid ALC_APIENTRY alcSuspendContext(ALCcontext *pContext)
 {
     SuspendContext(NULL);
     if(IsContext(pContext))
@@ -842,7 +842,7 @@ ALCAPI ALCvoid ALCAPIENTRY alcSuspendContext(ALCcontext *pContext)
 
     Not functional
 */
-ALCAPI ALCvoid ALCAPIENTRY alcProcessContext(ALCcontext *pContext)
+ALC_API ALCvoid ALC_APIENTRY alcProcessContext(ALCcontext *pContext)
 {
     SuspendContext(NULL);
     if(IsContext(pContext))
@@ -856,7 +856,7 @@ ALCAPI ALCvoid ALCAPIENTRY alcProcessContext(ALCcontext *pContext)
 
     Returns information about the Device, and error strings
 */
-ALCAPI const ALCchar* ALCAPIENTRY alcGetString(ALCdevice *pDevice,ALCenum param)
+ALC_API const ALCchar* ALC_APIENTRY alcGetString(ALCdevice *pDevice,ALCenum param)
 {
     const ALCchar *value = NULL;
 
@@ -968,7 +968,7 @@ ALCAPI const ALCchar* ALCAPIENTRY alcGetString(ALCdevice *pDevice,ALCenum param)
 
     Returns information about the Device and the version of Open AL
 */
-ALCAPI ALCvoid ALCAPIENTRY alcGetIntegerv(ALCdevice *device,ALCenum param,ALsizei size,ALCint *data)
+ALC_API ALCvoid ALC_APIENTRY alcGetIntegerv(ALCdevice *device,ALCenum param,ALsizei size,ALCint *data)
 {
     if(size == 0 || data == NULL)
     {
@@ -1120,7 +1120,7 @@ ALCAPI ALCvoid ALCAPIENTRY alcGetIntegerv(ALCdevice *device,ALCenum param,ALsize
 
     Determines if there is support for a particular extension
 */
-ALCAPI ALCboolean ALCAPIENTRY alcIsExtensionPresent(ALCdevice *device, const ALCchar *extName)
+ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent(ALCdevice *device, const ALCchar *extName)
 {
     ALCboolean bResult = ALC_FALSE;
 
@@ -1159,7 +1159,7 @@ ALCAPI ALCboolean ALCAPIENTRY alcIsExtensionPresent(ALCdevice *device, const ALC
 
     Retrieves the function address for a particular extension function
 */
-ALCAPI ALCvoid *  ALCAPIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcName)
+ALC_API ALCvoid* ALC_APIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcName)
 {
     ALCvoid *pFunction = NULL;
     ALsizei i = 0;
@@ -1183,7 +1183,7 @@ ALCAPI ALCvoid *  ALCAPIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar
 
     Get the value for a particular ALC Enumerated Value
 */
-ALCAPI ALCenum ALCAPIENTRY alcGetEnumValue(ALCdevice *device, const ALCchar *enumName)
+ALC_API ALCenum ALC_APIENTRY alcGetEnumValue(ALCdevice *device, const ALCchar *enumName)
 {
     ALsizei i = 0;
     ALCenum val;
@@ -1204,7 +1204,7 @@ ALCAPI ALCenum ALCAPIENTRY alcGetEnumValue(ALCdevice *device, const ALCchar *enu
 
     Create and attach a Context to a particular Device.
 */
-ALCAPI ALCcontext* ALCAPIENTRY alcCreateContext(ALCdevice *device, const ALCint *attrList)
+ALC_API ALCcontext* ALC_APIENTRY alcCreateContext(ALCdevice *device, const ALCint *attrList)
 {
     ALuint attrIdx, reqStereoSources;
     ALCcontext *ALContext;
@@ -1387,7 +1387,7 @@ ALCAPI ALCcontext* ALCAPIENTRY alcCreateContext(ALCdevice *device, const ALCint
 
     Remove a Context
 */
-ALCAPI ALCvoid ALCAPIENTRY alcDestroyContext(ALCcontext *context)
+ALC_API ALCvoid ALC_APIENTRY alcDestroyContext(ALCcontext *context)
 {
     ALCcontext **list;
     ALuint i;
@@ -1457,7 +1457,7 @@ ALCAPI ALCvoid ALCAPIENTRY alcDestroyContext(ALCcontext *context)
 
     Returns the currently active Context
 */
-ALCAPI ALCcontext * ALCAPIENTRY alcGetCurrentContext(ALCvoid)
+ALC_API ALCcontext* ALC_APIENTRY alcGetCurrentContext(ALCvoid)
 {
     ALCcontext *pContext;
 
@@ -1472,7 +1472,7 @@ ALCAPI ALCcontext * ALCAPIENTRY alcGetCurrentContext(ALCvoid)
 
     Returns the currently active thread-local Context
 */
-ALCcontext * ALCAPIENTRY alcGetThreadContext(void)
+ALCcontext* ALC_APIENTRY alcGetThreadContext(void)
 {
     ALCcontext *pContext = NULL;
 
@@ -1496,7 +1496,7 @@ ALCcontext * ALCAPIENTRY alcGetThreadContext(void)
 
     Returns the Device that a particular Context is attached to
 */
-ALCAPI ALCdevice* ALCAPIENTRY alcGetContextsDevice(ALCcontext *pContext)
+ALC_API ALCdevice* ALC_APIENTRY alcGetContextsDevice(ALCcontext *pContext)
 {
     ALCdevice *pDevice = NULL;
 
@@ -1516,7 +1516,7 @@ ALCAPI ALCdevice* ALCAPIENTRY alcGetContextsDevice(ALCcontext *pContext)
 
     Makes the given Context the active Context
 */
-ALCAPI ALCboolean ALCAPIENTRY alcMakeContextCurrent(ALCcontext *context)
+ALC_API ALCboolean ALC_APIENTRY alcMakeContextCurrent(ALCcontext *context)
 {
     ALCcontext *ALContext;
     ALboolean bReturn = AL_TRUE;
@@ -1562,7 +1562,7 @@ ALCAPI ALCboolean ALCAPIENTRY alcMakeContextCurrent(ALCcontext *context)
 
     Makes the given Context the active Context for the current thread
 */
-ALCboolean ALCAPIENTRY alcMakeCurrent(ALCcontext *context)
+ALCboolean ALC_APIENTRY alcMakeCurrent(ALCcontext *context)
 {
     ALboolean bReturn = AL_TRUE;
 
@@ -1696,7 +1696,7 @@ static ALenum GetFormatFromString(const char *str)
 
     Open the Device specified.
 */
-ALCAPI ALCdevice* ALCAPIENTRY alcOpenDevice(const ALCchar *deviceName)
+ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName)
 {
     ALboolean bDeviceFound = AL_FALSE;
     ALCdevice *device;
@@ -1806,7 +1806,7 @@ ALCAPI ALCdevice* ALCAPIENTRY alcOpenDevice(const ALCchar *deviceName)
 
     Close the specified Device
 */
-ALCAPI ALCboolean ALCAPIENTRY alcCloseDevice(ALCdevice *pDevice)
+ALC_API ALCboolean ALC_APIENTRY alcCloseDevice(ALCdevice *pDevice)
 {
     ALCboolean bReturn = ALC_FALSE;
     ALCdevice **list;
diff --git a/OpenAL32/Include/alBuffer.h b/OpenAL32/Include/alBuffer.h
index f37e9b81..f27fc60d 100644
--- a/OpenAL32/Include/alBuffer.h
+++ b/OpenAL32/Include/alBuffer.h
@@ -26,7 +26,7 @@ typedef struct ALbuffer
     struct ALbuffer *next;
 } ALbuffer;
 
-ALvoid ALAPIENTRY alBufferSubDataEXT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length);
+ALvoid AL_APIENTRY alBufferSubDataEXT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length);
 
 ALvoid ReleaseALBuffers(ALCdevice *device);
 
diff --git a/OpenAL32/Include/alDatabuffer.h b/OpenAL32/Include/alDatabuffer.h
index 82594265..bae787c8 100644
--- a/OpenAL32/Include/alDatabuffer.h
+++ b/OpenAL32/Include/alDatabuffer.h
@@ -24,27 +24,27 @@ typedef struct ALdatabuffer
     struct ALdatabuffer *next;
 } ALdatabuffer;
 
-ALvoid ALAPIENTRY alGenDatabuffersEXT(ALsizei n,ALuint *puiBuffers);
-ALvoid ALAPIENTRY alDeleteDatabuffersEXT(ALsizei n, const ALuint *puiBuffers);
-ALboolean ALAPIENTRY alIsDatabufferEXT(ALuint uiBuffer);
-
-ALvoid ALAPIENTRY alDatabufferDataEXT(ALuint buffer,const ALvoid *data,ALsizeiptrEXT size,ALenum usage);
-ALvoid ALAPIENTRY alDatabufferSubDataEXT(ALuint buffer, ALintptrEXT start, ALsizeiptrEXT length, const ALvoid *data);
-ALvoid ALAPIENTRY alGetDatabufferSubDataEXT(ALuint buffer, ALintptrEXT start, ALsizeiptrEXT length, ALvoid *data);
-
-ALvoid ALAPIENTRY alDatabufferfEXT(ALuint buffer, ALenum eParam, ALfloat flValue);
-ALvoid ALAPIENTRY alDatabufferfvEXT(ALuint buffer, ALenum eParam, const ALfloat* flValues);
-ALvoid ALAPIENTRY alDatabufferiEXT(ALuint buffer, ALenum eParam, ALint lValue);
-ALvoid ALAPIENTRY alDatabufferivEXT(ALuint buffer, ALenum eParam, const ALint* plValues);
-ALvoid ALAPIENTRY alGetDatabufferfEXT(ALuint buffer, ALenum eParam, ALfloat *pflValue);
-ALvoid ALAPIENTRY alGetDatabufferfvEXT(ALuint buffer, ALenum eParam, ALfloat* pflValues);
-ALvoid ALAPIENTRY alGetDatabufferiEXT(ALuint buffer, ALenum eParam, ALint *plValue);
-ALvoid ALAPIENTRY alGetDatabufferivEXT(ALuint buffer, ALenum eParam, ALint* plValues);
-
-ALvoid ALAPIENTRY alSelectDatabufferEXT(ALenum target, ALuint uiBuffer);
-
-ALvoid* ALAPIENTRY alMapDatabufferEXT(ALuint uiBuffer, ALintptrEXT start, ALsizeiptrEXT length, ALenum access);
-ALvoid ALAPIENTRY alUnmapDatabufferEXT(ALuint uiBuffer);
+ALvoid AL_APIENTRY alGenDatabuffersEXT(ALsizei n,ALuint *puiBuffers);
+ALvoid AL_APIENTRY alDeleteDatabuffersEXT(ALsizei n, const ALuint *puiBuffers);
+ALboolean AL_APIENTRY alIsDatabufferEXT(ALuint uiBuffer);
+
+ALvoid AL_APIENTRY alDatabufferDataEXT(ALuint buffer,const ALvoid *data,ALsizeiptrEXT size,ALenum usage);
+ALvoid AL_APIENTRY alDatabufferSubDataEXT(ALuint buffer, ALintptrEXT start, ALsizeiptrEXT length, const ALvoid *data);
+ALvoid AL_APIENTRY alGetDatabufferSubDataEXT(ALuint buffer, ALintptrEXT start, ALsizeiptrEXT length, ALvoid *data);
+
+ALvoid AL_APIENTRY alDatabufferfEXT(ALuint buffer, ALenum eParam, ALfloat flValue);
+ALvoid AL_APIENTRY alDatabufferfvEXT(ALuint buffer, ALenum eParam, const ALfloat* flValues);
+ALvoid AL_APIENTRY alDatabufferiEXT(ALuint buffer, ALenum eParam, ALint lValue);
+ALvoid AL_APIENTRY alDatabufferivEXT(ALuint buffer, ALenum eParam, const ALint* plValues);
+ALvoid AL_APIENTRY alGetDatabufferfEXT(ALuint buffer, ALenum eParam, ALfloat *pflValue);
+ALvoid AL_APIENTRY alGetDatabufferfvEXT(ALuint buffer, ALenum eParam, ALfloat* pflValues);
+ALvoid AL_APIENTRY alGetDatabufferiEXT(ALuint buffer, ALenum eParam, ALint *plValue);
+ALvoid AL_APIENTRY alGetDatabufferivEXT(ALuint buffer, ALenum eParam, ALint* plValues);
+
+ALvoid AL_APIENTRY alSelectDatabufferEXT(ALenum target, ALuint uiBuffer);
+
+ALvoid* AL_APIENTRY alMapDatabufferEXT(ALuint uiBuffer, ALintptrEXT start, ALsizeiptrEXT length, ALenum access);
+ALvoid AL_APIENTRY alUnmapDatabufferEXT(ALuint uiBuffer);
 
 ALvoid ReleaseALDatabuffers(ALCdevice *device);
 
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index ade664e3..a57870a7 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -376,8 +376,8 @@ void al_print(const char *fname, unsigned int line, const char *fmt, ...)
              PRINTF_STYLE(3,4);
 #define AL_PRINT(...) al_print(__FILE__, __LINE__, __VA_ARGS__)
 
-ALCboolean  ALCAPIENTRY alcMakeCurrent(ALCcontext *context);
-ALCcontext* ALCAPIENTRY alcGetThreadContext(void);
+ALCboolean  ALC_APIENTRY alcMakeCurrent(ALCcontext *context);
+ALCcontext* ALC_APIENTRY alcGetThreadContext(void);
 
 #define DECL_VERIFIER(name, type, field)                                      \
 static type* Verify##name(type *list, ALuint id)                              \
diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c
index 29e987a2..071e56fe 100644
--- a/OpenAL32/alBuffer.c
+++ b/OpenAL32/alBuffer.c
@@ -104,7 +104,7 @@ static const ALshort muLawDecompressionTable[256] = {
 *
 *    Generates n AL Buffers, and stores the Buffers Names in the array pointed to by puiBuffers
 */
-ALAPI ALvoid ALAPIENTRY alGenBuffers(ALsizei n,ALuint *puiBuffers)
+AL_API ALvoid AL_APIENTRY alGenBuffers(ALsizei n,ALuint *puiBuffers)
 {
     ALCcontext *Context;
     ALsizei i=0;
@@ -159,7 +159,7 @@ ALAPI ALvoid ALAPIENTRY alGenBuffers(ALsizei n,ALuint *puiBuffers)
 *
 *    Deletes the n AL Buffers pointed to by puiBuffers
 */
-ALAPI ALvoid ALAPIENTRY alDeleteBuffers(ALsizei n, const ALuint *puiBuffers)
+AL_API ALvoid AL_APIENTRY alDeleteBuffers(ALsizei n, const ALuint *puiBuffers)
 {
     ALCcontext *Context;
     ALbuffer *ALBuf;
@@ -238,7 +238,7 @@ ALAPI ALvoid ALAPIENTRY alDeleteBuffers(ALsizei n, const ALuint *puiBuffers)
 *
 *    Checks if ulBuffer is a valid Buffer Name
 */
-ALAPI ALboolean ALAPIENTRY alIsBuffer(ALuint uiBuffer)
+AL_API ALboolean AL_APIENTRY alIsBuffer(ALuint uiBuffer)
 {
     ALCcontext *Context;
     ALboolean  result = AL_TRUE;
@@ -260,7 +260,7 @@ ALAPI ALboolean ALAPIENTRY alIsBuffer(ALuint uiBuffer)
 *
 *    Fill buffer with audio data
 */
-ALAPI ALvoid ALAPIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid *data,ALsizei size,ALsizei freq)
+AL_API ALvoid AL_APIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid *data,ALsizei size,ALsizei freq)
 {
     ALCcontext *Context;
     ALCdevice *device;
@@ -511,7 +511,7 @@ ALAPI ALvoid ALAPIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid *d
 *
 *    Fill buffer with audio data
 */
-ALvoid ALAPIENTRY alBufferSubDataEXT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length)
+ALvoid AL_APIENTRY alBufferSubDataEXT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length)
 {
     ALCcontext *Context;
     ALCdevice  *device;
@@ -658,7 +658,7 @@ ALvoid ALAPIENTRY alBufferSubDataEXT(ALuint buffer,ALenum format,const ALvoid *d
 }
 
 
-ALAPI void ALAPIENTRY alBufferf(ALuint buffer, ALenum eParam, ALfloat flValue)
+AL_API void AL_APIENTRY alBufferf(ALuint buffer, ALenum eParam, ALfloat flValue)
 {
     ALCcontext    *pContext;
     ALCdevice     *device;
@@ -687,7 +687,7 @@ ALAPI void ALAPIENTRY alBufferf(ALuint buffer, ALenum eParam, ALfloat flValue)
 }
 
 
-ALAPI void ALAPIENTRY alBuffer3f(ALuint buffer, ALenum eParam, ALfloat flValue1, ALfloat flValue2, ALfloat flValue3)
+AL_API void AL_APIENTRY alBuffer3f(ALuint buffer, ALenum eParam, ALfloat flValue1, ALfloat flValue2, ALfloat flValue3)
 {
     ALCcontext    *pContext;
     ALCdevice     *device;
@@ -718,7 +718,7 @@ ALAPI void ALAPIENTRY alBuffer3f(ALuint buffer, ALenum eParam, ALfloat flValue1,
 }
 
 
-ALAPI void ALAPIENTRY alBufferfv(ALuint buffer, ALenum eParam, const ALfloat* flValues)
+AL_API void AL_APIENTRY alBufferfv(ALuint buffer, ALenum eParam, const ALfloat* flValues)
 {
     ALCcontext    *pContext;
     ALCdevice     *device;
@@ -747,7 +747,7 @@ ALAPI void ALAPIENTRY alBufferfv(ALuint buffer, ALenum eParam, const ALfloat* fl
 }
 
 
-ALAPI void ALAPIENTRY alBufferi(ALuint buffer, ALenum eParam, ALint lValue)
+AL_API void AL_APIENTRY alBufferi(ALuint buffer, ALenum eParam, ALint lValue)
 {
     ALCcontext    *pContext;
     ALCdevice     *device;
@@ -776,7 +776,7 @@ ALAPI void ALAPIENTRY alBufferi(ALuint buffer, ALenum eParam, ALint lValue)
 }
 
 
-ALAPI void ALAPIENTRY alBuffer3i( ALuint buffer, ALenum eParam, ALint lValue1, ALint lValue2, ALint lValue3)
+AL_API void AL_APIENTRY alBuffer3i( ALuint buffer, ALenum eParam, ALint lValue1, ALint lValue2, ALint lValue3)
 {
     ALCcontext    *pContext;
     ALCdevice     *device;
@@ -807,7 +807,7 @@ ALAPI void ALAPIENTRY alBuffer3i( ALuint buffer, ALenum eParam, ALint lValue1, A
 }
 
 
-ALAPI void ALAPIENTRY alBufferiv(ALuint buffer, ALenum eParam, const ALint* plValues)
+AL_API void AL_APIENTRY alBufferiv(ALuint buffer, ALenum eParam, const ALint* plValues)
 {
     ALCcontext    *pContext;
     ALCdevice     *device;
@@ -836,7 +836,7 @@ ALAPI void ALAPIENTRY alBufferiv(ALuint buffer, ALenum eParam, const ALint* plVa
 }
 
 
-ALAPI ALvoid ALAPIENTRY alGetBufferf(ALuint buffer, ALenum eParam, ALfloat *pflValue)
+AL_API ALvoid AL_APIENTRY alGetBufferf(ALuint buffer, ALenum eParam, ALfloat *pflValue)
 {
     ALCcontext    *pContext;
     ALCdevice     *device;
@@ -870,7 +870,7 @@ ALAPI ALvoid ALAPIENTRY alGetBufferf(ALuint buffer, ALenum eParam, ALfloat *pflV
 }
 
 
-ALAPI void ALAPIENTRY alGetBuffer3f(ALuint buffer, ALenum eParam, ALfloat* pflValue1, ALfloat* pflValue2, ALfloat* pflValue3)
+AL_API void AL_APIENTRY alGetBuffer3f(ALuint buffer, ALenum eParam, ALfloat* pflValue1, ALfloat* pflValue2, ALfloat* pflValue3)
 {
     ALCcontext    *pContext;
     ALCdevice     *device;
@@ -904,7 +904,7 @@ ALAPI void ALAPIENTRY alGetBuffer3f(ALuint buffer, ALenum eParam, ALfloat* pflVa
 }
 
 
-ALAPI void ALAPIENTRY alGetBufferfv(ALuint buffer, ALenum eParam, ALfloat* pflValues)
+AL_API void AL_APIENTRY alGetBufferfv(ALuint buffer, ALenum eParam, ALfloat* pflValues)
 {
     ALCcontext    *pContext;
     ALCdevice     *device;
@@ -938,7 +938,7 @@ ALAPI void ALAPIENTRY alGetBufferfv(ALuint buffer, ALenum eParam, ALfloat* pflVa
 }
 
 
-ALAPI ALvoid ALAPIENTRY alGetBufferi(ALuint buffer, ALenum eParam, ALint *plValue)
+AL_API ALvoid AL_APIENTRY alGetBufferi(ALuint buffer, ALenum eParam, ALint *plValue)
 {
     ALCcontext    *pContext;
     ALbuffer      *pBuffer;
@@ -989,7 +989,7 @@ ALAPI ALvoid ALAPIENTRY alGetBufferi(ALuint buffer, ALenum eParam, ALint *plValu
 }
 
 
-ALAPI void ALAPIENTRY alGetBuffer3i(ALuint buffer, ALenum eParam, ALint* plValue1, ALint* plValue2, ALint* plValue3)
+AL_API void AL_APIENTRY alGetBuffer3i(ALuint buffer, ALenum eParam, ALint* plValue1, ALint* plValue2, ALint* plValue3)
 {
     ALCcontext    *pContext;
     ALCdevice     *device;
@@ -1023,7 +1023,7 @@ ALAPI void ALAPIENTRY alGetBuffer3i(ALuint buffer, ALenum eParam, ALint* plValue
 }
 
 
-ALAPI void ALAPIENTRY alGetBufferiv(ALuint buffer, ALenum eParam, ALint* plValues)
+AL_API void AL_APIENTRY alGetBufferiv(ALuint buffer, ALenum eParam, ALint* plValues)
 {
     ALCcontext    *pContext;
     ALCdevice     *device;
diff --git a/OpenAL32/alDatabuffer.c b/OpenAL32/alDatabuffer.c
index 85b1a1c2..1f5302e6 100644
--- a/OpenAL32/alDatabuffer.c
+++ b/OpenAL32/alDatabuffer.c
@@ -39,7 +39,7 @@ DECL_VERIFIER(Databuffer, ALdatabuffer, databuffer)
 *
 *    Generates n AL Databuffers, and stores the Databuffers Names in the array pointed to by puiBuffers
 */
-ALvoid ALAPIENTRY alGenDatabuffersEXT(ALsizei n,ALuint *puiBuffers)
+ALvoid AL_APIENTRY alGenDatabuffersEXT(ALsizei n,ALuint *puiBuffers)
 {
     ALCcontext *Context;
     ALsizei i=0;
@@ -92,7 +92,7 @@ ALvoid ALAPIENTRY alGenDatabuffersEXT(ALsizei n,ALuint *puiBuffers)
 *
 *    Deletes the n AL Databuffers pointed to by puiBuffers
 */
-ALvoid ALAPIENTRY alDeleteDatabuffersEXT(ALsizei n, const ALuint *puiBuffers)
+ALvoid AL_APIENTRY alDeleteDatabuffersEXT(ALsizei n, const ALuint *puiBuffers)
 {
     ALCcontext *Context;
     ALdatabuffer *ALBuf;
@@ -178,7 +178,7 @@ ALvoid ALAPIENTRY alDeleteDatabuffersEXT(ALsizei n, const ALuint *puiBuffers)
 *
 *    Checks if ulBuffer is a valid Databuffer Name
 */
-ALboolean ALAPIENTRY alIsDatabufferEXT(ALuint uiBuffer)
+ALboolean AL_APIENTRY alIsDatabufferEXT(ALuint uiBuffer)
 {
     ALCcontext *Context;
     ALboolean  result = AL_TRUE;
@@ -202,7 +202,7 @@ ALboolean ALAPIENTRY alIsDatabufferEXT(ALuint uiBuffer)
 *
 *    Fill databuffer with data
 */
-ALvoid ALAPIENTRY alDatabufferDataEXT(ALuint buffer,const ALvoid *data,ALsizeiptrEXT size,ALenum usage)
+ALvoid AL_APIENTRY alDatabufferDataEXT(ALuint buffer,const ALvoid *data,ALsizeiptrEXT size,ALenum usage)
 {
     ALCcontext *Context;
     ALdatabuffer *ALBuf;
@@ -253,7 +253,7 @@ ALvoid ALAPIENTRY alDatabufferDataEXT(ALuint buffer,const ALvoid *data,ALsizeipt
     ProcessContext(Context);
 }
 
-ALvoid ALAPIENTRY alDatabufferSubDataEXT(ALuint uiBuffer, ALintptrEXT start, ALsizeiptrEXT length, const ALvoid *data)
+ALvoid AL_APIENTRY alDatabufferSubDataEXT(ALuint uiBuffer, ALintptrEXT start, ALsizeiptrEXT length, const ALvoid *data)
 {
     ALCcontext    *pContext;
     ALdatabuffer  *pBuffer;
@@ -281,7 +281,7 @@ ALvoid ALAPIENTRY alDatabufferSubDataEXT(ALuint uiBuffer, ALintptrEXT start, ALs
     ProcessContext(pContext);
 }
 
-ALvoid ALAPIENTRY alGetDatabufferSubDataEXT(ALuint uiBuffer, ALintptrEXT start, ALsizeiptrEXT length, ALvoid *data)
+ALvoid AL_APIENTRY alGetDatabufferSubDataEXT(ALuint uiBuffer, ALintptrEXT start, ALsizeiptrEXT length, ALvoid *data)
 {
     ALCcontext    *pContext;
     ALdatabuffer  *pBuffer;
@@ -310,7 +310,7 @@ ALvoid ALAPIENTRY alGetDatabufferSubDataEXT(ALuint uiBuffer, ALintptrEXT start,
 }
 
 
-ALvoid ALAPIENTRY alDatabufferfEXT(ALuint buffer, ALenum eParam, ALfloat flValue)
+ALvoid AL_APIENTRY alDatabufferfEXT(ALuint buffer, ALenum eParam, ALfloat flValue)
 {
     ALCcontext    *pContext;
     ALCdevice     *Device;
@@ -336,7 +336,7 @@ ALvoid ALAPIENTRY alDatabufferfEXT(ALuint buffer, ALenum eParam, ALfloat flValue
     ProcessContext(pContext);
 }
 
-ALvoid ALAPIENTRY alDatabufferfvEXT(ALuint buffer, ALenum eParam, const ALfloat* flValues)
+ALvoid AL_APIENTRY alDatabufferfvEXT(ALuint buffer, ALenum eParam, const ALfloat* flValues)
 {
     ALCcontext    *pContext;
     ALCdevice     *Device;
@@ -363,7 +363,7 @@ ALvoid ALAPIENTRY alDatabufferfvEXT(ALuint buffer, ALenum eParam, const ALfloat*
 }
 
 
-ALvoid ALAPIENTRY alDatabufferiEXT(ALuint buffer, ALenum eParam, ALint lValue)
+ALvoid AL_APIENTRY alDatabufferiEXT(ALuint buffer, ALenum eParam, ALint lValue)
 {
     ALCcontext    *pContext;
     ALCdevice     *Device;
@@ -389,7 +389,7 @@ ALvoid ALAPIENTRY alDatabufferiEXT(ALuint buffer, ALenum eParam, ALint lValue)
     ProcessContext(pContext);
 }
 
-ALvoid ALAPIENTRY alDatabufferivEXT(ALuint buffer, ALenum eParam, const ALint* plValues)
+ALvoid AL_APIENTRY alDatabufferivEXT(ALuint buffer, ALenum eParam, const ALint* plValues)
 {
     ALCcontext    *pContext;
     ALCdevice     *Device;
@@ -416,7 +416,7 @@ ALvoid ALAPIENTRY alDatabufferivEXT(ALuint buffer, ALenum eParam, const ALint* p
 }
 
 
-ALvoid ALAPIENTRY alGetDatabufferfEXT(ALuint buffer, ALenum eParam, ALfloat *pflValue)
+ALvoid AL_APIENTRY alGetDatabufferfEXT(ALuint buffer, ALenum eParam, ALfloat *pflValue)
 {
     ALCcontext    *pContext;
     ALCdevice     *Device;
@@ -445,7 +445,7 @@ ALvoid ALAPIENTRY alGetDatabufferfEXT(ALuint buffer, ALenum eParam, ALfloat *pfl
     ProcessContext(pContext);
 }
 
-ALvoid ALAPIENTRY alGetDatabufferfvEXT(ALuint buffer, ALenum eParam, ALfloat* pflValues)
+ALvoid AL_APIENTRY alGetDatabufferfvEXT(ALuint buffer, ALenum eParam, ALfloat* pflValues)
 {
     ALCcontext    *pContext;
     ALCdevice     *Device;
@@ -474,7 +474,7 @@ ALvoid ALAPIENTRY alGetDatabufferfvEXT(ALuint buffer, ALenum eParam, ALfloat* pf
     ProcessContext(pContext);
 }
 
-ALvoid ALAPIENTRY alGetDatabufferiEXT(ALuint buffer, ALenum eParam, ALint *plValue)
+ALvoid AL_APIENTRY alGetDatabufferiEXT(ALuint buffer, ALenum eParam, ALint *plValue)
 {
     ALCcontext    *pContext;
     ALdatabuffer  *pBuffer;
@@ -508,7 +508,7 @@ ALvoid ALAPIENTRY alGetDatabufferiEXT(ALuint buffer, ALenum eParam, ALint *plVal
     ProcessContext(pContext);
 }
 
-ALvoid ALAPIENTRY alGetDatabufferivEXT(ALuint buffer, ALenum eParam, ALint* plValues)
+ALvoid AL_APIENTRY alGetDatabufferivEXT(ALuint buffer, ALenum eParam, ALint* plValues)
 {
     ALCcontext    *pContext;
     ALCdevice     *Device;
@@ -542,7 +542,7 @@ ALvoid ALAPIENTRY alGetDatabufferivEXT(ALuint buffer, ALenum eParam, ALint* plVa
 }
 
 
-ALvoid ALAPIENTRY alSelectDatabufferEXT(ALenum target, ALuint uiBuffer)
+ALvoid AL_APIENTRY alSelectDatabufferEXT(ALenum target, ALuint uiBuffer)
 {
     ALCcontext    *pContext;
     ALdatabuffer  *pBuffer = NULL;
@@ -569,7 +569,7 @@ ALvoid ALAPIENTRY alSelectDatabufferEXT(ALenum target, ALuint uiBuffer)
 }
 
 
-ALvoid* ALAPIENTRY alMapDatabufferEXT(ALuint uiBuffer, ALintptrEXT start, ALsizeiptrEXT length, ALenum access)
+ALvoid* AL_APIENTRY alMapDatabufferEXT(ALuint uiBuffer, ALintptrEXT start, ALsizeiptrEXT length, ALenum access)
 {
     ALCcontext    *pContext;
     ALdatabuffer  *pBuffer;
@@ -609,7 +609,7 @@ ALvoid* ALAPIENTRY alMapDatabufferEXT(ALuint uiBuffer, ALintptrEXT start, ALsize
     return ret;
 }
 
-ALvoid ALAPIENTRY alUnmapDatabufferEXT(ALuint uiBuffer)
+ALvoid AL_APIENTRY alUnmapDatabufferEXT(ALuint uiBuffer)
 {
     ALCcontext    *pContext;
     ALdatabuffer  *pBuffer;
diff --git a/OpenAL32/alError.c b/OpenAL32/alError.c
index 8435b426..43b8e44d 100644
--- a/OpenAL32/alError.c
+++ b/OpenAL32/alError.c
@@ -24,7 +24,7 @@
 #include "AL/alc.h"
 #include "alError.h"
 
-ALAPI ALenum ALAPIENTRY alGetError(ALvoid)
+AL_API ALenum AL_APIENTRY alGetError(ALvoid)
 {
     ALCcontext *Context;
     ALenum errorCode;
diff --git a/OpenAL32/alExtension.c b/OpenAL32/alExtension.c
index f2daed79..e4d74788 100644
--- a/OpenAL32/alExtension.c
+++ b/OpenAL32/alExtension.c
@@ -355,7 +355,7 @@ static ALenums enumeration[]={
 
 
 
-ALAPI ALboolean ALAPIENTRY alIsExtensionPresent(const ALchar *extName)
+AL_API ALboolean AL_APIENTRY alIsExtensionPresent(const ALchar *extName)
 {
     ALboolean bIsSupported = AL_FALSE;
     ALCcontext *pContext;
@@ -396,7 +396,7 @@ ALAPI ALboolean ALAPIENTRY alIsExtensionPresent(const ALchar *extName)
 }
 
 
-ALAPI ALvoid * ALAPIENTRY alGetProcAddress(const ALchar *funcName)
+AL_API ALvoid * AL_APIENTRY alGetProcAddress(const ALchar *funcName)
 {
     ALsizei i = 0;
 
@@ -407,7 +407,7 @@ ALAPI ALvoid * ALAPIENTRY alGetProcAddress(const ALchar *funcName)
     return function[i].address;
 }
 
-ALAPI ALenum ALAPIENTRY alGetEnumValue(const ALchar *enumName)
+AL_API ALenum AL_APIENTRY alGetEnumValue(const ALchar *enumName)
 {
     ALsizei i = 0;
 
diff --git a/OpenAL32/alListener.c b/OpenAL32/alListener.c
index 8928ba7a..b743f207 100644
--- a/OpenAL32/alListener.c
+++ b/OpenAL32/alListener.c
@@ -26,7 +26,7 @@
 #include "alListener.h"
 #include "alSource.h"
 
-ALAPI ALvoid ALAPIENTRY alListenerf(ALenum eParam, ALfloat flValue)
+AL_API ALvoid AL_APIENTRY alListenerf(ALenum eParam, ALfloat flValue)
 {
     ALCcontext *pContext;
     ALboolean updateAll = AL_FALSE;
@@ -77,7 +77,7 @@ ALAPI ALvoid ALAPIENTRY alListenerf(ALenum eParam, ALfloat flValue)
 }
 
 
-ALAPI ALvoid ALAPIENTRY alListener3f(ALenum eParam, ALfloat flValue1, ALfloat flValue2, ALfloat flValue3)
+AL_API ALvoid AL_APIENTRY alListener3f(ALenum eParam, ALfloat flValue1, ALfloat flValue2, ALfloat flValue3)
 {
     ALCcontext *pContext;
     ALboolean updateWorld = AL_FALSE;
@@ -121,7 +121,7 @@ ALAPI ALvoid ALAPIENTRY alListener3f(ALenum eParam, ALfloat flValue1, ALfloat fl
 }
 
 
-ALAPI ALvoid ALAPIENTRY alListenerfv(ALenum eParam, const ALfloat *pflValues)
+AL_API ALvoid AL_APIENTRY alListenerfv(ALenum eParam, const ALfloat *pflValues)
 {
     ALCcontext *pContext;
     ALboolean updateWorld = AL_FALSE;
@@ -177,7 +177,7 @@ ALAPI ALvoid ALAPIENTRY alListenerfv(ALenum eParam, const ALfloat *pflValues)
 }
 
 
-ALAPI ALvoid ALAPIENTRY alListeneri(ALenum eParam, ALint lValue)
+AL_API ALvoid AL_APIENTRY alListeneri(ALenum eParam, ALint lValue)
 {
     ALCcontext *pContext;
 
@@ -197,7 +197,7 @@ ALAPI ALvoid ALAPIENTRY alListeneri(ALenum eParam, ALint lValue)
 }
 
 
-ALAPI void ALAPIENTRY alListener3i(ALenum eParam, ALint lValue1, ALint lValue2, ALint lValue3)
+AL_API void AL_APIENTRY alListener3i(ALenum eParam, ALint lValue1, ALint lValue2, ALint lValue3)
 {
     ALCcontext *pContext;
 
@@ -220,7 +220,7 @@ ALAPI void ALAPIENTRY alListener3i(ALenum eParam, ALint lValue1, ALint lValue2,
 }
 
 
-ALAPI void ALAPIENTRY alListeneriv( ALenum eParam, const ALint* plValues )
+AL_API void AL_APIENTRY alListeneriv( ALenum eParam, const ALint* plValues )
 {
     ALCcontext *pContext;
     ALfloat flValues[6];
@@ -262,7 +262,7 @@ ALAPI void ALAPIENTRY alListeneriv( ALenum eParam, const ALint* plValues )
 }
 
 
-ALAPI ALvoid ALAPIENTRY alGetListenerf(ALenum eParam, ALfloat *pflValue)
+AL_API ALvoid AL_APIENTRY alGetListenerf(ALenum eParam, ALfloat *pflValue)
 {
     ALCcontext *pContext;
 
@@ -293,7 +293,7 @@ ALAPI ALvoid ALAPIENTRY alGetListenerf(ALenum eParam, ALfloat *pflValue)
 }
 
 
-ALAPI ALvoid ALAPIENTRY alGetListener3f(ALenum eParam, ALfloat *pflValue1, ALfloat *pflValue2, ALfloat *pflValue3)
+AL_API ALvoid AL_APIENTRY alGetListener3f(ALenum eParam, ALfloat *pflValue1, ALfloat *pflValue2, ALfloat *pflValue3)
 {
     ALCcontext *pContext;
 
@@ -328,7 +328,7 @@ ALAPI ALvoid ALAPIENTRY alGetListener3f(ALenum eParam, ALfloat *pflValue1, ALflo
 }
 
 
-ALAPI ALvoid ALAPIENTRY alGetListenerfv(ALenum eParam, ALfloat *pflValues)
+AL_API ALvoid AL_APIENTRY alGetListenerfv(ALenum eParam, ALfloat *pflValues)
 {
     ALCcontext *pContext;
 
@@ -381,7 +381,7 @@ ALAPI ALvoid ALAPIENTRY alGetListenerfv(ALenum eParam, ALfloat *pflValues)
 }
 
 
-ALAPI ALvoid ALAPIENTRY alGetListeneri(ALenum eParam, ALint *plValue)
+AL_API ALvoid AL_APIENTRY alGetListeneri(ALenum eParam, ALint *plValue)
 {
     ALCcontext *pContext;
 
@@ -404,7 +404,7 @@ ALAPI ALvoid ALAPIENTRY alGetListeneri(ALenum eParam, ALint *plValue)
 }
 
 
-ALAPI void ALAPIENTRY alGetListener3i(ALenum eParam, ALint *plValue1, ALint *plValue2, ALint *plValue3)
+AL_API void AL_APIENTRY alGetListener3i(ALenum eParam, ALint *plValue1, ALint *plValue2, ALint *plValue3)
 {
     ALCcontext *pContext;
 
@@ -439,7 +439,7 @@ ALAPI void ALAPIENTRY alGetListener3i(ALenum eParam, ALint *plValue1, ALint *plV
 }
 
 
-ALAPI void ALAPIENTRY alGetListeneriv(ALenum eParam, ALint* plValues)
+AL_API void AL_APIENTRY alGetListeneriv(ALenum eParam, ALint* plValues)
 {
     ALCcontext *pContext;
 
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index 642ff424..ca5b4e28 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -42,7 +42,7 @@ DECL_VERIFIER(Buffer, ALbuffer, buffer)
 DECL_VERIFIER(Filter, ALfilter, filter)
 DECL_VERIFIER(EffectSlot, ALeffectslot, effectslot)
 
-ALAPI ALvoid ALAPIENTRY alGenSources(ALsizei n,ALuint *sources)
+AL_API ALvoid AL_APIENTRY alGenSources(ALsizei n,ALuint *sources)
 {
     ALCcontext *Context;
     ALCdevice *Device;
@@ -103,7 +103,7 @@ ALAPI ALvoid ALAPIENTRY alGenSources(ALsizei n,ALuint *sources)
 }
 
 
-ALAPI ALvoid ALAPIENTRY alDeleteSources(ALsizei n, const ALuint *sources)
+AL_API ALvoid AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources)
 {
     ALCcontext *Context;
     ALCdevice  *Device;
@@ -184,7 +184,7 @@ ALAPI ALvoid ALAPIENTRY alDeleteSources(ALsizei n, const ALuint *sources)
 }
 
 
-ALAPI ALboolean ALAPIENTRY alIsSource(ALuint source)
+AL_API ALboolean AL_APIENTRY alIsSource(ALuint source)
 {
     ALCcontext *Context;
     ALboolean  result;
@@ -200,7 +200,7 @@ ALAPI ALboolean ALAPIENTRY alIsSource(ALuint source)
 }
 
 
-ALAPI ALvoid ALAPIENTRY alSourcef(ALuint source, ALenum eParam, ALfloat flValue)
+AL_API ALvoid AL_APIENTRY alSourcef(ALuint source, ALenum eParam, ALfloat flValue)
 {
     ALCcontext    *pContext;
     ALsource    *pSource;
@@ -392,7 +392,7 @@ ALAPI ALvoid ALAPIENTRY alSourcef(ALuint source, ALenum eParam, ALfloat flValue)
 }
 
 
-ALAPI ALvoid ALAPIENTRY alSource3f(ALuint source, ALenum eParam, ALfloat flValue1,ALfloat flValue2,ALfloat flValue3)
+AL_API ALvoid AL_APIENTRY alSource3f(ALuint source, ALenum eParam, ALfloat flValue1,ALfloat flValue2,ALfloat flValue3)
 {
     ALCcontext    *pContext;
     ALsource    *pSource;
@@ -437,7 +437,7 @@ ALAPI ALvoid ALAPIENTRY alSource3f(ALuint source, ALenum eParam, ALfloat flValue
 }
 
 
-ALAPI ALvoid ALAPIENTRY alSourcefv(ALuint source, ALenum eParam, const ALfloat *pflValues)
+AL_API ALvoid AL_APIENTRY alSourcefv(ALuint source, ALenum eParam, const ALfloat *pflValues)
 {
     ALCcontext    *pContext;
 
@@ -490,7 +490,7 @@ ALAPI ALvoid ALAPIENTRY alSourcefv(ALuint source, ALenum eParam, const ALfloat *
 }
 
 
-ALAPI ALvoid ALAPIENTRY alSourcei(ALuint source,ALenum eParam,ALint lValue)
+AL_API ALvoid AL_APIENTRY alSourcei(ALuint source,ALenum eParam,ALint lValue)
 {
     ALCcontext          *pContext;
     ALsource            *pSource;
@@ -693,7 +693,7 @@ ALAPI ALvoid ALAPIENTRY alSourcei(ALuint source,ALenum eParam,ALint lValue)
 }
 
 
-ALAPI void ALAPIENTRY alSource3i(ALuint source, ALenum eParam, ALint lValue1, ALint lValue2, ALint lValue3)
+AL_API void AL_APIENTRY alSource3i(ALuint source, ALenum eParam, ALint lValue1, ALint lValue2, ALint lValue3)
 {
     ALCcontext *pContext;
     ALsource   *pSource;
@@ -757,7 +757,7 @@ ALAPI void ALAPIENTRY alSource3i(ALuint source, ALenum eParam, ALint lValue1, AL
 }
 
 
-ALAPI void ALAPIENTRY alSourceiv(ALuint source, ALenum eParam, const ALint* plValues)
+AL_API void AL_APIENTRY alSourceiv(ALuint source, ALenum eParam, const ALint* plValues)
 {
     ALCcontext    *pContext;
 
@@ -812,7 +812,7 @@ ALAPI void ALAPIENTRY alSourceiv(ALuint source, ALenum eParam, const ALint* plVa
 }
 
 
-ALAPI ALvoid ALAPIENTRY alGetSourcef(ALuint source, ALenum eParam, ALfloat *pflValue)
+AL_API ALvoid AL_APIENTRY alGetSourcef(ALuint source, ALenum eParam, ALfloat *pflValue)
 {
     ALCcontext  *pContext;
     ALsource    *pSource;
@@ -908,7 +908,7 @@ ALAPI ALvoid ALAPIENTRY alGetSourcef(ALuint source, ALenum eParam, ALfloat *pflV
 }
 
 
-ALAPI ALvoid ALAPIENTRY alGetSource3f(ALuint source, ALenum eParam, ALfloat* pflValue1, ALfloat* pflValue2, ALfloat* pflValue3)
+AL_API ALvoid AL_APIENTRY alGetSource3f(ALuint source, ALenum eParam, ALfloat* pflValue1, ALfloat* pflValue2, ALfloat* pflValue3)
 {
     ALCcontext    *pContext;
     ALsource    *pSource;
@@ -955,7 +955,7 @@ ALAPI ALvoid ALAPIENTRY alGetSource3f(ALuint source, ALenum eParam, ALfloat* pfl
 }
 
 
-ALAPI ALvoid ALAPIENTRY alGetSourcefv(ALuint source, ALenum eParam, ALfloat *pflValues)
+AL_API ALvoid AL_APIENTRY alGetSourcefv(ALuint source, ALenum eParam, ALfloat *pflValues)
 {
     ALCcontext  *pContext;
     ALsource    *pSource;
@@ -1033,7 +1033,7 @@ ALAPI ALvoid ALAPIENTRY alGetSourcefv(ALuint source, ALenum eParam, ALfloat *pfl
 }
 
 
-ALAPI ALvoid ALAPIENTRY alGetSourcei(ALuint source, ALenum eParam, ALint *plValue)
+AL_API ALvoid AL_APIENTRY alGetSourcei(ALuint source, ALenum eParam, ALint *plValue)
 {
     ALCcontext *pContext;
     ALsource   *pSource;
@@ -1152,7 +1152,7 @@ ALAPI ALvoid ALAPIENTRY alGetSourcei(ALuint source, ALenum eParam, ALint *plValu
 }
 
 
-ALAPI void ALAPIENTRY alGetSource3i(ALuint source, ALenum eParam, ALint* plValue1, ALint* plValue2, ALint* plValue3)
+AL_API void AL_APIENTRY alGetSource3i(ALuint source, ALenum eParam, ALint* plValue1, ALint* plValue2, ALint* plValue3)
 {
     ALCcontext  *pContext;
     ALsource    *pSource;
@@ -1199,7 +1199,7 @@ ALAPI void ALAPIENTRY alGetSource3i(ALuint source, ALenum eParam, ALint* plValue
 }
 
 
-ALAPI void ALAPIENTRY alGetSourceiv(ALuint source, ALenum eParam, ALint* plValues)
+AL_API void AL_APIENTRY alGetSourceiv(ALuint source, ALenum eParam, ALint* plValues)
 {
     ALCcontext  *pContext;
     ALsource    *pSource;
@@ -1281,12 +1281,12 @@ ALAPI void ALAPIENTRY alGetSourceiv(ALuint source, ALenum eParam, ALint* plValue
 }
 
 
-ALAPI ALvoid ALAPIENTRY alSourcePlay(ALuint source)
+AL_API ALvoid AL_APIENTRY alSourcePlay(ALuint source)
 {
     alSourcePlayv(1, &source);
 }
 
-ALAPI ALvoid ALAPIENTRY alSourcePlayv(ALsizei n, const ALuint *pSourceList)
+AL_API ALvoid AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *pSourceList)
 {
     ALCcontext          *pContext;
     ALsource            *pSource;
@@ -1384,12 +1384,12 @@ ALAPI ALvoid ALAPIENTRY alSourcePlayv(ALsizei n, const ALuint *pSourceList)
     ProcessContext(pContext);
 }
 
-ALAPI ALvoid ALAPIENTRY alSourcePause(ALuint source)
+AL_API ALvoid AL_APIENTRY alSourcePause(ALuint source)
 {
     alSourcePausev(1, &source);
 }
 
-ALAPI ALvoid ALAPIENTRY alSourcePausev(ALsizei n, const ALuint *sources)
+AL_API ALvoid AL_APIENTRY alSourcePausev(ALsizei n, const ALuint *sources)
 {
     ALCcontext *Context;
     ALsource *Source;
@@ -1431,12 +1431,12 @@ ALAPI ALvoid ALAPIENTRY alSourcePausev(ALsizei n, const ALuint *sources)
     ProcessContext(Context);
 }
 
-ALAPI ALvoid ALAPIENTRY alSourceStop(ALuint source)
+AL_API ALvoid AL_APIENTRY alSourceStop(ALuint source)
 {
     alSourceStopv(1, &source);
 }
 
-ALAPI ALvoid ALAPIENTRY alSourceStopv(ALsizei n, const ALuint *sources)
+AL_API ALvoid AL_APIENTRY alSourceStopv(ALsizei n, const ALuint *sources)
 {
     ALCcontext *Context;
     ALsource *Source;
@@ -1482,12 +1482,12 @@ ALAPI ALvoid ALAPIENTRY alSourceStopv(ALsizei n, const ALuint *sources)
     ProcessContext(Context);
 }
 
-ALAPI ALvoid ALAPIENTRY alSourceRewind(ALuint source)
+AL_API ALvoid AL_APIENTRY alSourceRewind(ALuint source)
 {
     alSourceRewindv(1, &source);
 }
 
-ALAPI ALvoid ALAPIENTRY alSourceRewindv(ALsizei n, const ALuint *sources)
+AL_API ALvoid AL_APIENTRY alSourceRewindv(ALsizei n, const ALuint *sources)
 {
     ALCcontext *Context;
     ALsource *Source;
@@ -1538,7 +1538,7 @@ ALAPI ALvoid ALAPIENTRY alSourceRewindv(ALsizei n, const ALuint *sources)
 }
 
 
-ALAPI ALvoid ALAPIENTRY alSourceQueueBuffers( ALuint source, ALsizei n, const ALuint* buffers )
+AL_API ALvoid AL_APIENTRY alSourceQueueBuffers( ALuint source, ALsizei n, const ALuint* buffers )
 {
     ALCcontext *Context;
     ALsource *ALSource;
@@ -1686,7 +1686,7 @@ ALAPI ALvoid ALAPIENTRY alSourceQueueBuffers( ALuint source, ALsizei n, const AL
 
 // Implementation assumes that n is the number of buffers to be removed from the queue and buffers is
 // an array of buffer IDs that are to be filled with the names of the buffers removed
-ALAPI ALvoid ALAPIENTRY alSourceUnqueueBuffers( ALuint source, ALsizei n, ALuint* buffers )
+AL_API ALvoid AL_APIENTRY alSourceUnqueueBuffers( ALuint source, ALsizei n, ALuint* buffers )
 {
     ALCcontext *Context;
     ALsource *ALSource;
diff --git a/OpenAL32/alState.c b/OpenAL32/alState.c
index 4ca25dfe..4393d189 100644
--- a/OpenAL32/alState.c
+++ b/OpenAL32/alState.c
@@ -41,7 +41,7 @@ static const ALchar alErrInvalidValue[] = "Invalid Value";
 static const ALchar alErrInvalidOp[] = "Invalid Operation";
 static const ALchar alErrOutOfMemory[] = "Out of Memory";
 
-ALAPI ALvoid ALAPIENTRY alEnable(ALenum capability)
+AL_API ALvoid AL_APIENTRY alEnable(ALenum capability)
 {
     ALCcontext *Context;
     ALboolean  updateSources = AL_FALSE;
@@ -74,7 +74,7 @@ ALAPI ALvoid ALAPIENTRY alEnable(ALenum capability)
     ProcessContext(Context);
 }
 
-ALAPI ALvoid ALAPIENTRY alDisable(ALenum capability)
+AL_API ALvoid AL_APIENTRY alDisable(ALenum capability)
 {
     ALCcontext *Context;
     ALboolean  updateSources = AL_FALSE;
@@ -107,7 +107,7 @@ ALAPI ALvoid ALAPIENTRY alDisable(ALenum capability)
     ProcessContext(Context);
 }
 
-ALAPI ALboolean ALAPIENTRY alIsEnabled(ALenum capability)
+AL_API ALboolean AL_APIENTRY alIsEnabled(ALenum capability)
 {
     ALCcontext *Context;
     ALboolean value=AL_FALSE;
@@ -131,7 +131,7 @@ ALAPI ALboolean ALAPIENTRY alIsEnabled(ALenum capability)
     return value;
 }
 
-ALAPI ALboolean ALAPIENTRY alGetBoolean(ALenum pname)
+AL_API ALboolean AL_APIENTRY alGetBoolean(ALenum pname)
 {
     ALCcontext *Context;
     ALboolean value=AL_FALSE;
@@ -171,7 +171,7 @@ ALAPI ALboolean ALAPIENTRY alGetBoolean(ALenum pname)
     return value;
 }
 
-ALAPI ALdouble ALAPIENTRY alGetDouble(ALenum pname)
+AL_API ALdouble AL_APIENTRY alGetDouble(ALenum pname)
 {
     ALCcontext *Context;
     ALdouble value = 0.0;
@@ -207,7 +207,7 @@ ALAPI ALdouble ALAPIENTRY alGetDouble(ALenum pname)
     return value;
 }
 
-ALAPI ALfloat ALAPIENTRY alGetFloat(ALenum pname)
+AL_API ALfloat AL_APIENTRY alGetFloat(ALenum pname)
 {
     ALCcontext *Context;
     ALfloat value = 0.0f;
@@ -243,7 +243,7 @@ ALAPI ALfloat ALAPIENTRY alGetFloat(ALenum pname)
     return value;
 }
 
-ALAPI ALint ALAPIENTRY alGetInteger(ALenum pname)
+AL_API ALint AL_APIENTRY alGetInteger(ALenum pname)
 {
     ALCcontext *Context;
     ALint value = 0;
@@ -293,7 +293,7 @@ ALAPI ALint ALAPIENTRY alGetInteger(ALenum pname)
     return value;
 }
 
-ALAPI ALvoid ALAPIENTRY alGetBooleanv(ALenum pname,ALboolean *data)
+AL_API ALvoid AL_APIENTRY alGetBooleanv(ALenum pname,ALboolean *data)
 {
     ALCcontext *Context;
 
@@ -334,7 +334,7 @@ ALAPI ALvoid ALAPIENTRY alGetBooleanv(ALenum pname,ALboolean *data)
     ProcessContext(Context);
 }
 
-ALAPI ALvoid ALAPIENTRY alGetDoublev(ALenum pname,ALdouble *data)
+AL_API ALvoid AL_APIENTRY alGetDoublev(ALenum pname,ALdouble *data)
 {
     ALCcontext *Context;
 
@@ -375,7 +375,7 @@ ALAPI ALvoid ALAPIENTRY alGetDoublev(ALenum pname,ALdouble *data)
     ProcessContext(Context);
 }
 
-ALAPI ALvoid ALAPIENTRY alGetFloatv(ALenum pname,ALfloat *data)
+AL_API ALvoid AL_APIENTRY alGetFloatv(ALenum pname,ALfloat *data)
 {
     ALCcontext *Context;
 
@@ -416,7 +416,7 @@ ALAPI ALvoid ALAPIENTRY alGetFloatv(ALenum pname,ALfloat *data)
     ProcessContext(Context);
 }
 
-ALAPI ALvoid ALAPIENTRY alGetIntegerv(ALenum pname,ALint *data)
+AL_API ALvoid AL_APIENTRY alGetIntegerv(ALenum pname,ALint *data)
 {
     ALCcontext *Context;
 
@@ -471,7 +471,7 @@ ALAPI ALvoid ALAPIENTRY alGetIntegerv(ALenum pname,ALint *data)
     ProcessContext(Context);
 }
 
-ALAPI const ALchar* ALAPIENTRY alGetString(ALenum pname)
+AL_API const ALchar* AL_APIENTRY alGetString(ALenum pname)
 {
     const ALchar *value;
     ALCcontext *pContext;
@@ -532,7 +532,7 @@ ALAPI const ALchar* ALAPIENTRY alGetString(ALenum pname)
     return value;
 }
 
-ALAPI ALvoid ALAPIENTRY alDopplerFactor(ALfloat value)
+AL_API ALvoid AL_APIENTRY alDopplerFactor(ALfloat value)
 {
     ALCcontext *Context;
     ALboolean updateSources = AL_FALSE;
@@ -563,7 +563,7 @@ ALAPI ALvoid ALAPIENTRY alDopplerFactor(ALfloat value)
     ProcessContext(Context);
 }
 
-ALAPI ALvoid ALAPIENTRY alDopplerVelocity(ALfloat value)
+AL_API ALvoid AL_APIENTRY alDopplerVelocity(ALfloat value)
 {
     ALCcontext *Context;
     ALboolean updateSources = AL_FALSE;
@@ -592,7 +592,7 @@ ALAPI ALvoid ALAPIENTRY alDopplerVelocity(ALfloat value)
     ProcessContext(Context);
 }
 
-ALAPI ALvoid ALAPIENTRY alSpeedOfSound(ALfloat flSpeedOfSound)
+AL_API ALvoid AL_APIENTRY alSpeedOfSound(ALfloat flSpeedOfSound)
 {
     ALCcontext *pContext;
     ALboolean updateSources = AL_FALSE;
@@ -621,7 +621,7 @@ ALAPI ALvoid ALAPIENTRY alSpeedOfSound(ALfloat flSpeedOfSound)
     ProcessContext(pContext);
 }
 
-ALAPI ALvoid ALAPIENTRY alDistanceModel(ALenum value)
+AL_API ALvoid AL_APIENTRY alDistanceModel(ALenum value)
 {
     ALCcontext *Context;
     ALboolean updateSources = AL_FALSE;