mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 12:11:13 +00:00
Corrected the configure.ac so it actually works. Updated some c files so that they build on Solaris. This mostly in...
Original commit message from CVS: Corrected the configure.ac so it actually works. Updated some c files so that they build on Solaris. This mostly involved supporting ISO style variable-argument macros.
This commit is contained in:
parent
c642d08357
commit
97ae59b6ba
3 changed files with 33 additions and 10 deletions
24
configure.ac
24
configure.ac
|
@ -41,17 +41,21 @@ AM_PROG_AS
|
|||
AS="${CC}"
|
||||
|
||||
dnl decide on error flags
|
||||
AS_COMPILER_FLAG(-Wall,GST_ERROR="$GST_ERROR -Wall",GST_ERROR="$GST_ERROR")
|
||||
if test "x$GST_CVS"="xyes"; then
|
||||
AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR")
|
||||
AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
|
||||
|
||||
# Only set these optimization flags if gcc is being used.
|
||||
#
|
||||
GST_FUNROLL_CFLAGS="$GST_FUNROLL_CFLAGS -funroll-all-loops"
|
||||
GST_FINLINE_CFLAGS="$GST_FINLINE_CFLAGS -finline-functions"
|
||||
GST_FFASTMATH_CFLAGS="$GST_FFASTMATH_CFLAGS -ffast-math"
|
||||
GST_FSCHEDULE_CFLAGS="$GST_FSCHEDULE_CFLAGS -fschedule-insns2"
|
||||
GST_FNOEXCEPTIONS_CFLAGS="$GST_FNOEXCEPTIONS_CFLAGS -fno-exceptions"
|
||||
if test "x$GST_WALL" = "xyes"; then
|
||||
GST_ERROR="$GST_ERROR -Wall"
|
||||
|
||||
if test "x$GST_CVS" = "xyes"; then
|
||||
AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR")
|
||||
fi
|
||||
|
||||
dnl set gcc-style optimization flags if using the gnu compiler.
|
||||
GST_FUNROLL_CFLAGS="$GST_FUNROLL_CFLAGS -funroll-all-loops"
|
||||
GST_FINLINE_CFLAGS="$GST_FINLINE_CFLAGS -finline-functions"
|
||||
GST_FFASTMATH_CFLAGS="$GST_FFASTMATH_CFLAGS -ffast-math"
|
||||
GST_FSCHEDULE_CFLAGS="$GST_FSCHEDULE_CFLAGS -fschedule-insns2"
|
||||
GST_FNOEXCEPTIONS_CFLAGS="$GST_FNOEXCEPTIONS_CFLAGS -fno-exceptions"
|
||||
fi
|
||||
|
||||
dnl determine c++ compiler
|
||||
|
|
|
@ -22,9 +22,20 @@
|
|||
#include "media-info.h"
|
||||
|
||||
static gboolean _gst_media_info_debug = TRUE;
|
||||
|
||||
#ifdef G_HAVE_ISO_VARARGS
|
||||
|
||||
#define GMI_DEBUG(...) \
|
||||
{ if (_gst_media_info_debug) { g_print ( __VA_ARGS__ ); }}
|
||||
|
||||
#elif defined(G_HAVE_GNUC_VARARGS)
|
||||
|
||||
#define GMI_DEBUG(format, args...) \
|
||||
{ if (_gst_media_info_debug) { g_print ( format , ## args ); }}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
struct GstMediaInfoPriv
|
||||
{
|
||||
GstElement *pipeline;
|
||||
|
|
|
@ -21,8 +21,16 @@
|
|||
#include <riff.h>
|
||||
|
||||
/*#define debug(format,args...) g_print(format,##args) */
|
||||
|
||||
#ifdef G_HAVE_ISO_VARARGS
|
||||
|
||||
#define debug(format,...)
|
||||
|
||||
#elif defined(G_HAVE_GNUC_VARARGS)
|
||||
|
||||
#define debug(format,args...)
|
||||
|
||||
#endif
|
||||
|
||||
gulong gst_riff_fourcc_to_id(gchar *fourcc) {
|
||||
g_return_val_if_fail(fourcc != NULL, 0);
|
||||
|
|
Loading…
Reference in a new issue