Replace libvlc_exception_get_message with libvlc_errmsg

[vlc] / src / control / mediacontrol_internal.h

diff --git a/src/control/mediacontrol_internal.h b/src/control/mediacontrol_internal.h
index 6ca9a43143b8309b5cd11aba22c3a0b17307d4fe..f248a8b61f69c7d78800659226fffd70a79974d6 100644 (file)
--- a/src/control/mediacontrol_internal.h
+++ b/src/control/mediacontrol_internal.h
@@ -57,21 +57,21 @@ mediacontrol_RGBPicture *private_mediacontrol_createRGBPicture( int, int, long,
 #define RAISE( c, m )  if( exception ) { exception->code = c;    \
                                          exception->message = strdup(m); }
 
-#define RAISE_NULL( c, m ) { RAISE( c, m ); return NULL; }
-#define RAISE_VOID( c, m ) { RAISE( c, m ); return; }
+#define RAISE_NULL( c, m ) do{ RAISE( c, m ); return NULL; } while(0)
+#define RAISE_VOID( c, m ) do{ RAISE( c, m ); return;      } while(0)
 
 #define HANDLE_LIBVLC_EXCEPTION_VOID( e )  if( libvlc_exception_raised( e ) ) {    \
-    RAISE( mediacontrol_InternalException, libvlc_exception_get_message( e )); \
+    RAISE( mediacontrol_InternalException, libvlc_errmsg()); \
         libvlc_exception_clear( e ); \
         return; }
 
 #define HANDLE_LIBVLC_EXCEPTION_NULL( e )  if( libvlc_exception_raised( e ) ) {     \
-        RAISE( mediacontrol_InternalException, libvlc_exception_get_message( e )); \
+        RAISE( mediacontrol_InternalException, libvlc_errmsg()); \
         libvlc_exception_clear( e ); \
         return NULL; }
 
 #define HANDLE_LIBVLC_EXCEPTION_ZERO( e )  if( libvlc_exception_raised( e ) ) { \
-        RAISE( mediacontrol_InternalException, libvlc_exception_get_message( e )); \
+        RAISE( mediacontrol_InternalException, libvlc_errmsg()); \
         libvlc_exception_clear( e ); \
         return 0; }