summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
m---------common0
-rw-r--r--configure.ac3
-rw-r--r--ext/mpeg2enc/gstmpeg2encpicturereader.cc1
-rw-r--r--ext/mplex/gstmplex.cc2
-rw-r--r--tests/check/Makefile.am2
6 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c6e0d84..62587eb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-03-21 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * configure.ac:
+ Check if the compiler supports do { } while (0) macros. This fixes
+ a warning when compiling with g++ 4.3, resulting in a build failure
+ because of -Werror.
+
+ * ext/mpeg2enc/gstmpeg2encpicturereader.cc:
+ * ext/mplex/gstmplex.cc:
+ Include <string.h> for memcpy and friends to fix the build with
+ gcc 4.3.
+
+ * tests/check/Makefile.am:
+ Remove trailing backslash.
+
2008-03-20 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/selector/gstinputselector.c:
diff --git a/common b/common
-Subproject 170f8e91adc7157f6e708ffa58ca22d10e4e45d
+Subproject 9a358e5cc3977fd6121f12dd25a358081fd7704
diff --git a/configure.ac b/configure.ac
index 10372ef1..2d8f9310 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,9 @@ AS_PROG_OBJC
dnl check if the compiler supports '-c' and '-o' options
AM_PROG_CC_C_O
+dnl check if the compiler supports do while(0) macros
+AG_GST_CHECK_DOWHILE_MACROS
+
AC_PATH_PROG(VALGRIND_PATH, valgrind, no)
AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")
diff --git a/ext/mpeg2enc/gstmpeg2encpicturereader.cc b/ext/mpeg2enc/gstmpeg2encpicturereader.cc
index 5bd09dd7..77e38440 100644
--- a/ext/mpeg2enc/gstmpeg2encpicturereader.cc
+++ b/ext/mpeg2enc/gstmpeg2encpicturereader.cc
@@ -24,6 +24,7 @@
#endif
#include <encoderparams.hh>
+#include <string.h>
#include "gstmpeg2enc.hh"
#include "gstmpeg2encpicturereader.hh"
diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc
index 53688235..e9535fe8 100644
--- a/ext/mplex/gstmplex.cc
+++ b/ext/mplex/gstmplex.cc
@@ -55,6 +55,8 @@
#include "config.h"
#endif
+#include <string.h>
+
#include "gstmplex.hh"
#include "gstmplexoutputstream.hh"
#include "gstmplexibitstream.hh"
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index abaf2300..d8724c65 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -71,7 +71,7 @@ VALGRIND_TESTS_DISABLE = \
check_PROGRAMS = \
generic/states \
$(check_mpeg2enc) \
- $(check_mplex) \
+ $(check_mplex) \
$(check_neon) \
$(check_soup) \
$(check_timidity) \