From 94dac7322dd4100dd58f8545463924b95faa68a5 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 25 Jan 2002 04:27:24 +0000 Subject: [PATCH] should fix an error in a no-glib2 error message, an error in libxml stuff and silencing a warning in the cothreads stuff Original commit message from CVS: should fix an error in a no-glib2 error message, an error in libxml stuff (newer versions of libxml1 can be included as libxml/parser.h), and silencing a warning in the cothreads stuff --- configure.ac | 2 +- gst/cothreads/test-pth-pthreads2.c | 2 +- gst/gstconfig.h | 16 ++-------------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 262d7a9..eb47f77 100644 --- a/configure.ac +++ b/configure.ac @@ -244,7 +244,7 @@ GST_CHECK_FEATURE(GLIB2, [use of glib-2.0 and GObject], , [ # if we've gotten this far, the user has specifically asked that glib2 be # used. if we have no glib2, that is an error. if test "x$HAVE_GLIB2" = "xno"; then - AC_MSG_ERROR(no glib2 found, try --disable-glib2) + AC_MSG_ERROR([no glib2 found, try --disable-glib2]) fi ], enabled, [ AC_DEFINE(USE_GLIB2) diff --git a/gst/cothreads/test-pth-pthreads2.c b/gst/cothreads/test-pth-pthreads2.c index e5beeef..ba55821 100644 --- a/gst/cothreads/test-pth-pthreads2.c +++ b/gst/cothreads/test-pth-pthreads2.c @@ -33,7 +33,7 @@ static _pthread_descr linuxthreads_self() pth_mctx_t main_context; int threadnum = 0; -void cothread (void *unused) +void cothread () { printf ("1.%d: current stack frame: %p\n", threadnum, CURRENT_STACK_FRAME); printf ("1.%d: sleeping 2s...\n", threadnum); diff --git a/gst/gstconfig.h b/gst/gstconfig.h index b775efb..e16af08 100644 --- a/gst/gstconfig.h +++ b/gst/gstconfig.h @@ -16,21 +16,9 @@ /***** Deal with XML stuff, we have to handle both loadsave and registry *****/ #if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) ) -#ifdef HAVE_LIBXML2 - #include -#else /* impossibly broken header namespacing */ - #include -#endif - - /* Include compatability defines: if libxml hasn't already defined these, */ - /* we have an old version 1.x */ - #ifndef xmlChildrenNode - #define xmlChildrenNode childs - #define xmlRootNode root - #endif - +# include #else - #define GST_DISABLE_LOADSAVE_REGISTRY +# define GST_DISABLE_LOADSAVE_REGISTRY #endif #endif /* __GST_CONFIG_H__ */ -- 2.7.4