diff options
| author | Chris Robinson <[email protected]> | 2014-01-02 10:42:00 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2014-01-02 10:42:00 -0800 |
| commit | 5f85a1dcf03598466b14ce0f2325a8cd881b9033 (patch) | |
| tree | 1c1cd583f3b76baad9cb58c16df1b2f5c9abfd0f | |
| parent | 01f547b93e8ce7e1ad774fee73c81777a034028e (diff) | |
Move some error macros to alError.h
| -rw-r--r-- | OpenAL32/Include/alError.h | 15 | ||||
| -rw-r--r-- | OpenAL32/Include/alMain.h | 16 |
2 files changed, 15 insertions, 16 deletions
diff --git a/OpenAL32/Include/alError.h b/OpenAL32/Include/alError.h index 0ade342d..ab91d27b 100644 --- a/OpenAL32/Include/alError.h +++ b/OpenAL32/Include/alError.h @@ -11,6 +11,21 @@ extern ALboolean TrapALError; ALvoid alSetError(ALCcontext *Context, ALenum errorCode); +#define SET_ERROR_AND_RETURN(ctx, err) do { \ + alSetError((ctx), (err)); \ + return; \ +} while(0) + +#define SET_ERROR_AND_RETURN_VALUE(ctx, err, val) do { \ + alSetError((ctx), (err)); \ + return (val); \ +} while(0) + +#define SET_ERROR_AND_GOTO(ctx, err, lbl) do { \ + alSetError((ctx), (err)); \ + goto lbl; \ +} while(0) + #ifdef __cplusplus } #endif diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index cb546d8f..b4966028 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -779,22 +779,6 @@ enum { void FillCPUCaps(ALuint capfilter); -#define SET_ERROR_AND_RETURN(ctx, err) do { \ - alSetError((ctx), (err)); \ - return; \ -} while(0) - -#define SET_ERROR_AND_RETURN_VALUE(ctx, err, val) do { \ - alSetError((ctx), (err)); \ - return (val); \ -} while(0) - -#define SET_ERROR_AND_GOTO(ctx, err, lbl) do { \ - alSetError((ctx), (err)); \ - goto lbl; \ -} while(0) - - /* Small hack to use a pointer-to-array type as a normal argument type. * Shouldn't be used directly. */ typedef ALfloat ALfloatBUFFERSIZE[BUFFERSIZE]; |