Start using a simpler method for error handling

This helps avoid the al_try/al_throwerr/al_endtry stuff.

1 files changed, 15 insertions, 0 deletions

diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 004c4016..92d6e7a8 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -869,6 +869,21 @@ enum {
 void FillCPUCaps(ALuint capfilter);
 
 
+#define SET_ERROR_AND_RETURN(ctx, err) do {                                    \
+    alSetError((ctx), (err));                                                  \
+    return;                                                                    \
+} while(0)
+
+#define SET_ERROR_AND_RETURN_VAL(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)
+
 /**
  * Starts a try block. Must not be nested within another try block within the
  * same function.