libbluray | branch: master | hpi1 <[email protected]> | Fri May 6 15:46:24 2011 +0300| [0cc42f90f402a0f50ab449fb8a59dec531711de4] | committer: hpi1
Added C++ compability to public headers > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=0cc42f90f402a0f50ab449fb8a59dec531711de4 --- src/file/filesystem.h | 7 +++++++ src/libbluray/bluray.h | 8 ++++++++ src/util/log_control.h | 7 +++++++ 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/src/file/filesystem.h b/src/file/filesystem.h index 4e707a2..5c2b9ce 100644 --- a/src/file/filesystem.h +++ b/src/file/filesystem.h @@ -21,6 +21,10 @@ #ifndef BD_FILESYSTEM_H_ #define BD_FILESYSTEM_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include <stdint.h> /* @@ -78,5 +82,8 @@ BD_FILE_OPEN bd_register_file(BD_FILE_OPEN p); */ BD_DIR_OPEN bd_register_dir(BD_DIR_OPEN p); +#ifdef __cplusplus +}; +#endif #endif /* BD_FILESYSTEM_H_ */ diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h index 6f5dd1f..bbbd257 100644 --- a/src/libbluray/bluray.h +++ b/src/libbluray/bluray.h @@ -22,6 +22,10 @@ #ifndef BLURAY_H_ #define BLURAY_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** * @file libbluray/bluray.h * external API header @@ -629,4 +633,8 @@ struct clpi_cl *bd_get_clpi(BLURAY *bd, unsigned clip_ref); */ void bd_free_clpi(struct clpi_cl *cl); +#ifdef __cplusplus +}; +#endif + #endif /* BLURAY_H_ */ diff --git a/src/util/log_control.h b/src/util/log_control.h index f413dd2..abbdb4d 100644 --- a/src/util/log_control.h +++ b/src/util/log_control.h @@ -21,6 +21,10 @@ #ifndef BD_LOG_CONTROL_H_ #define BD_LOG_CONTROL_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include <stdint.h> @@ -57,5 +61,8 @@ void bd_set_debug_handler(BD_LOG_FUNC); void bd_set_debug_mask(uint32_t mask); uint32_t bd_get_debug_mask(void); +#ifdef __cplusplus +}; +#endif #endif /* BD_LOG_CONTROL_H_ */ _______________________________________________ libbluray-devel mailing list [email protected] http://mailman.videolan.org/listinfo/libbluray-devel
