[vlc-devel] [PATCH 3/4] demux: adaptative: fix compilation on OS/2

KO Myung-Hun komh78 at gmail.com
Mon Sep 7 08:56:41 CEST 2015


atomic requires C++11. However, C++11 is disabled  on OS/2 due to
broken headers. Enable C++11 for adaptivate module specifically.

-----
  CXX      demux/adaptative/plumbing/libadaptative_plugin_la-CommandsQueue.lo
In file included from f:/lang/gcc/usr/local492/include/c++/4.9.2/atomic:38:0,
                 from ../include/vlc_atomic.h:221,
                 from demux/adaptative/plumbing/CommandsQueue.hpp:29,
                 from demux/adaptative/plumbing/CommandsQueue.cpp:20:
f:/lang/gcc/usr/local492/include/c++/4.9.2/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support is currently experimental, and must be enabled with the -std=c++11 or -std=gnu++11 compiler options.
 #error This file requires compiler and library support for the \
  ^
In file included from f:/lang/gcc/usr/local492/include/c++/4.9.2/atomic:41:0,
                 from ../include/vlc_atomic.h:221,
                 from demux/adaptative/plumbing/CommandsQueue.hpp:29,
                 from demux/adaptative/plumbing/CommandsQueue.cpp:20:
f:/lang/gcc/usr/local492/include/c++/4.9.2/bits/atomic_base.h:74:3: error: 'constexpr' does not name a type
   constexpr memory_order
   ^
...
-----
---
 modules/demux/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index cf290df..f464251 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -381,6 +381,9 @@ libadaptative_plugin_la_SOURCES += $(libadaptative_dash_SOURCES)
 libadaptative_plugin_la_SOURCES += demux/adaptative/adaptative.cpp
 libadaptative_plugin_la_SOURCES += demux/mp4/libmp4.c demux/mp4/libmp4.h
 libadaptative_plugin_la_CXXFLAGS = $(AM_CFLAGS) -I$(srcdir)/demux/adaptative
+if HAVE_OS2
+libadaptative_plugin_la_CXXFLAGS += -std=gnu++11
+endif
 libadaptative_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
 if HAVE_ZLIB
 libadaptative_plugin_la_LIBADD += -lz
-- 
1.9.5



More information about the vlc-devel mailing list