[vlc-commits] commit: C++ #include fix ( Rémi Denis-Courmont )

git at videolan.org git at videolan.org
Thu Mar 11 16:30:06 CET 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Mar 11 17:29:40 2010 +0200| [19fdcb237af935385d77d1c9cdb7a5e35afaef5c] | committer: Rémi Denis-Courmont 

C++ #include fix

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=19fdcb237af935385d77d1c9cdb7a5e35afaef5c
---

 include/vlc_vlm.h |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/vlc_vlm.h b/include/vlc_vlm.h
index dab4094..c9f68f2 100644
--- a/include/vlc_vlm.h
+++ b/include/vlc_vlm.h
@@ -220,8 +220,12 @@ static inline void vlm_media_Init( vlm_media_t *p_media )
  * \param p_dst vlm_media_t instance to copy to
  * \param p_src vlm_media_t instance to copy from
  */
-static inline void vlm_media_Copy( vlm_media_t *restrict p_dst,
-                                   const vlm_media_t *restrict p_src )
+static inline void
+#ifndef __cplusplus
+vlm_media_Copy( vlm_media_t *restrict p_dst, const vlm_media_t *restrict p_src )
+#else
+vlm_media_Copy( vlm_media_t *p_dst, const vlm_media_t *p_src )
+#endif
 {
     int i;
 



More information about the vlc-commits mailing list