X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Flibvlc_internal.h;h=7ab347d7aefd415eeeafabe49cf79acf8f94ae56;hb=d61a6d40f2330b4896d2a7d6a258c716578700fe;hp=c49c5b4acbf241cf5be98e35001791464d11961b;hpb=556953c4c2ec361c1d5508702083b76edf89cb4d;p=vlc diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h index c49c5b4acb..7ab347d7ae 100644 --- a/src/control/libvlc_internal.h +++ b/src/control/libvlc_internal.h @@ -36,6 +36,10 @@ #include +/* Note well: this header is included from LibVLC core. + * Therefore, static inline functions MUST NOT call LibVLC functions here + * (this can cause linkage failure on some platforms). */ + /*************************************************************************** * Internal creation and destruction functions ***************************************************************************/ @@ -99,21 +103,6 @@ void libvlc_event_attach_async( libvlc_event_manager_t * p_event_manager, libvlc_callback_t pf_callback, void *p_user_data ); -/* Exception shorcuts */ - -#define RAISENULL( ... ) { libvlc_printerr(__VA_ARGS__); \ - libvlc_exception_raise( p_e ); \ - return NULL; } -#define RAISEZERO( ... ) { libvlc_printerr(__VA_ARGS__); \ - libvlc_exception_raise( p_e ); \ - return 0; } - -static inline void clear_if_needed(libvlc_exception_t *e) -{ - if (libvlc_exception_raised(e)) - libvlc_exception_clear(e); -} - static inline libvlc_time_t from_mtime(mtime_t time) { return (time + 500ULL)/ 1000ULL;