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
This commit is contained in:
Andy Wingo 2002-01-25 04:27:24 +00:00
parent 11f8f4b345
commit 94dac7322d
3 changed files with 4 additions and 16 deletions

View file

@ -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 # if we've gotten this far, the user has specifically asked that glib2 be
# used. if we have no glib2, that is an error. # used. if we have no glib2, that is an error.
if test "x$HAVE_GLIB2" = "xno"; then 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 fi
], enabled, [ ], enabled, [
AC_DEFINE(USE_GLIB2) AC_DEFINE(USE_GLIB2)

View file

@ -33,7 +33,7 @@ static _pthread_descr linuxthreads_self()
pth_mctx_t main_context; pth_mctx_t main_context;
int threadnum = 0; int threadnum = 0;
void cothread (void *unused) void cothread ()
{ {
printf ("1.%d: current stack frame: %p\n", threadnum, CURRENT_STACK_FRAME); printf ("1.%d: current stack frame: %p\n", threadnum, CURRENT_STACK_FRAME);
printf ("1.%d: sleeping 2s...\n", threadnum); printf ("1.%d: sleeping 2s...\n", threadnum);

View file

@ -16,19 +16,7 @@
/***** Deal with XML stuff, we have to handle both loadsave and registry *****/ /***** Deal with XML stuff, we have to handle both loadsave and registry *****/
#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) ) #if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) )
#ifdef HAVE_LIBXML2
# include <libxml/parser.h> # include <libxml/parser.h>
#else /* impossibly broken header namespacing */
#include <parser.h>
#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
#else #else
# define GST_DISABLE_LOADSAVE_REGISTRY # define GST_DISABLE_LOADSAVE_REGISTRY
#endif #endif