OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

libobs: Fix deprecated macro

Browse source 
There's no need to have two separate macros to declare something as
deprecated.
This commit is contained in:
jp9000 2016-12-07 07:30:06 -08:00
parent ca607f8b35
commit b29d8a44d1
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libobs/obs.h
View file

@ -533,8 +533,8 @@ enum obs_base_effect {
EXPORT gs_effect_t *obs_get_base_effect(enum obs_base_effect effect);
/* DEPRECATED: gets texture_rect default effect */
DEPRECATED_START EXPORT gs_effect_t *obs_get_default_rect_effect(void)
DEPRECATED_END;
DEPRECATED
EXPORT gs_effect_t *obs_get_default_rect_effect(void);
/** Returns the primary obs signal handler */
EXPORT signal_handler_t *obs_get_signal_handler(void);

6
libobs/util/c99defs.h
View file

@ -24,12 +24,10 @@
#define UNUSED_PARAMETER(param) (void)param
#ifdef _MSC_VER
#define DEPRECATED_START __declspec(deprecated)
#define DEPRECATED_END
#define DEPRECATED __declspec(deprecated)
#define FORCE_INLINE __forceinline
#else
#define DEPRECATED_START
#define DEPRECATED_END __attribute__ ((deprecated))
#define DEPRECATED __attribute__ ((deprecated))
#define FORCE_INLINE inline __attribute__((always_inline))
#endif