diff options
author | Brian Cameron <brian.cameron@sun.com> | 2003-05-21 18:16:30 +0000 |
---|---|---|
committer | Brian Cameron <brian.cameron@sun.com> | 2003-05-21 18:16:30 +0000 |
commit | 4c3c8f6f108d324168058af3100d013497184956 (patch) | |
tree | 7c06fc306c4fd97efea17de75bbb0e4b494e5753 | |
parent | a62ca0048edd89cff24bc4550b456cf875bc5439 (diff) | |
download | gst-plugins-bad-4c3c8f6f108d324168058af3100d013497184956.tar.gz gst-plugins-bad-4c3c8f6f108d324168058af3100d013497184956.tar.bz2 gst-plugins-bad-4c3c8f6f108d324168058af3100d013497184956.zip |
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.
-rw-r--r-- | configure.ac | 26 | ||||
-rw-r--r-- | gst-libs/gst/media-info/media-info.c | 11 | ||||
-rw-r--r-- | gst-libs/gst/riff/riffutil.c | 8 | ||||
-rw-r--r-- | gst/mpeg1sys/buffer.c | 8 |
4 files changed, 42 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index b9c0bb0b..ba930d49 100644 --- a/configure.ac +++ b/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") - - # 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" +AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no") + +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 diff --git a/gst-libs/gst/media-info/media-info.c b/gst-libs/gst/media-info/media-info.c index e2afd51b..067286c4 100644 --- a/gst-libs/gst/media-info/media-info.c +++ b/gst-libs/gst/media-info/media-info.c @@ -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; diff --git a/gst-libs/gst/riff/riffutil.c b/gst-libs/gst/riff/riffutil.c index e4c134fb..f754f755 100644 --- a/gst-libs/gst/riff/riffutil.c +++ b/gst-libs/gst/riff/riffutil.c @@ -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); diff --git a/gst/mpeg1sys/buffer.c b/gst/mpeg1sys/buffer.c index 6554f03f..677c398b 100644 --- a/gst/mpeg1sys/buffer.c +++ b/gst/mpeg1sys/buffer.c @@ -34,8 +34,16 @@ #define CLOCKS 90000.0 +#ifdef G_HAVE_ISO_VARARGS + +#define DEBUG(...) g_print (__VA_ARGS__) + +#elif defined(G_HAVE_GNUC_VARARGS) + #define DEBUG(a, b...) g_print (##b) +#endif + /* This must match decoder and encoder tables */ static double picture_rates [16] = { |