mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Code

Use C externs for obs-module.h

Browse Source 
This allows inter-sharing of functions such as obs_module_text among
both C and C++ files
This commit is contained in:
jp9000 2014-08-29 11:19:58 -07:00
parent 513eaa5f36
commit e610fd77ce
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libobs/obs-module.h
View File

@ -21,8 +21,10 @@
#ifdef __cplusplus #ifdef __cplusplus
#define MODULE_EXPORT extern "C" EXPORT #define MODULE_EXPORT extern "C" EXPORT
#define MODULE_EXTERN extern "C"
#else #else
#define MODULE_EXPORT EXPORT #define MODULE_EXPORT EXPORT
#define MODULE_EXTERN extern
#endif #endif
/** /**
@ -84,10 +86,10 @@ MODULE_EXPORT void obs_module_free_locale(void);
} }
/** Helper function for looking up locale if default locale handler was used */ /** Helper function for looking up locale if default locale handler was used */
extern const char *obs_module_text(const char *lookup_string); MODULE_EXTERN const char *obs_module_text(const char *lookup_string);
/** Helper function that returns the current module */ /** Helper function that returns the current module */
extern obs_module_t obs_current_module(void); MODULE_EXTERN obs_module_t obs_current_module(void);
/** /**
* Returns the location to a module data file associated with the current * Returns the location to a module data file associated with the current