Commit a27b4e44 authored by Brian Cameron's avatar Brian Cameron

Corrected the configure.ac so it actually works. Updated some c files so that...

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.
parent 361c9eff
...@@ -41,17 +41,21 @@ AM_PROG_AS ...@@ -41,17 +41,21 @@ AM_PROG_AS
AS="${CC}" AS="${CC}"
dnl decide on error flags dnl decide on error flags
AS_COMPILER_FLAG(-Wall,GST_ERROR="$GST_ERROR -Wall",GST_ERROR="$GST_ERROR") AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
if test "x$GST_CVS"="xyes"; then
AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR") if test "x$GST_WALL" = "xyes"; then
GST_ERROR="$GST_ERROR -Wall"
# Only set these optimization flags if gcc is being used.
# if test "x$GST_CVS" = "xyes"; then
GST_FUNROLL_CFLAGS="$GST_FUNROLL_CFLAGS -funroll-all-loops" AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR")
GST_FINLINE_CFLAGS="$GST_FINLINE_CFLAGS -finline-functions" fi
GST_FFASTMATH_CFLAGS="$GST_FFASTMATH_CFLAGS -ffast-math"
GST_FSCHEDULE_CFLAGS="$GST_FSCHEDULE_CFLAGS -fschedule-insns2" dnl set gcc-style optimization flags if using the gnu compiler.
GST_FNOEXCEPTIONS_CFLAGS="$GST_FNOEXCEPTIONS_CFLAGS -fno-exceptions" 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 fi
dnl determine c++ compiler dnl determine c++ compiler
......
...@@ -22,9 +22,20 @@ ...@@ -22,9 +22,20 @@
#include "media-info.h" #include "media-info.h"
static gboolean _gst_media_info_debug = TRUE; 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...) \ #define GMI_DEBUG(format, args...) \
{ if (_gst_media_info_debug) { g_print ( format , ## args ); }} { if (_gst_media_info_debug) { g_print ( format , ## args ); }}
#endif
struct GstMediaInfoPriv struct GstMediaInfoPriv
{ {
GstElement *pipeline; GstElement *pipeline;
......
...@@ -21,8 +21,16 @@ ...@@ -21,8 +21,16 @@
#include <riff.h> #include <riff.h>
/*#define debug(format,args...) g_print(format,##args) */ /*#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...) #define debug(format,args...)
#endif
gulong gst_riff_fourcc_to_id(gchar *fourcc) { gulong gst_riff_fourcc_to_id(gchar *fourcc) {
g_return_val_if_fail(fourcc != NULL, 0); g_return_val_if_fail(fourcc != NULL, 0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment