[vlc-commits] demux: adaptative: fix compilation on OS/2

KO Myung-Hun git at videolan.org
Tue Oct 6 12:22:11 CEST 2015


vlc | branch: master | KO Myung-Hun <komh78 at gmail.com> | Sat Oct  3 15:14:41 2015 +0900| [2ede14e9f8fd87470e5aebf1ad82fdfe32534cf9] | committer: Jean-Baptiste Kempf

demux: adaptative: fix compilation on OS/2

-----
  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
   ^
...
-----

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 extras/package/os2/configure.sh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extras/package/os2/configure.sh b/extras/package/os2/configure.sh
index 235d7c1..47f6027 100644
--- a/extras/package/os2/configure.sh
+++ b/extras/package/os2/configure.sh
@@ -42,8 +42,8 @@ OPTIONS="
 "
 
 export ARCHFLAGS=${ARCHFLAGS-"-march=i486"}
-export CFLAGS="${CFLAGS} ${ARCHFLAGS}"
-export CXXFLAGS="${CXXFLAGS} ${ARCHFLAGS}"
-export BUILDCC="gcc -std=c99"
+export CFLAGS="${CFLAGS} ${ARCHFLAGS} -std=gnu11"
+export CXXFLAGS="${CXXFLAGS} ${ARCHFLAGS} -std=gnu++11"
+export BUILDCC="gcc -std=gnu11"
 
 sh "$(dirname $0)"/../../../configure ${OPTIONS} "$@"



More information about the vlc-commits mailing list