[vlc-commits] picture: only include vlc_atomic when needed

Rémi Denis-Courmont git at videolan.org
Mon Jul 25 22:28:56 CEST 2016


vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul 25 23:27:37 2016 +0300| [e9511cec1064092a2cb5d65b63f3d917501ad742] | committer: Rémi Denis-Courmont

picture: only include vlc_atomic when needed

<vlc_atomic.h> does not support C++ properly in VLC 2.2.
This should avoids build breakages in C++ modules.

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

 include/vlc_picture.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/vlc_picture.h b/include/vlc_picture.h
index dea3f7f..e45374b 100644
--- a/include/vlc_picture.h
+++ b/include/vlc_picture.h
@@ -32,7 +32,9 @@
  */
 
 #include <vlc_es.h>
-#include <vlc_atomic.h>
+#if (defined (__LIBVLC__) && !defined (__PLUGIN__))
+# include <vlc_atomic.h>
+#endif
 
 /** Description of a planar graphic field */
 typedef struct plane_t



More information about the vlc-commits mailing list