[gq-commit] gq/src xmlparse.h,1.1,1.2

[<sta...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4234

Modified Files:
	xmlparse.h 
Log Message:
* Fixed a macro-bug - forgot to properly add parens
* Added an include needed to support encoding tricks during upgrading
  a .gq


Index: xmlparse.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/xmlparse.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xmlparse.h	4 Oct 2003 06:57:03 -0000	1.1
--- xmlparse.h	4 Oct 2003 10:05:26 -0000	1.2
***************
*** 32,35 ****
--- 32,36 ----
  #ifdef HAVE_LIBXML2
  #   include <libxml/SAX.h>
+ #   include <libxml/parserInternals.h>
  #elif defined(HAVE_LIBXML)
  #   include <gnome-xml/SAX.h>
***************
*** 98,103 ****
  
  #define XMLhandleFatalError(ctx, ...) \
! 	if (ctx->XMLhandler->fatalError) { \
! 	    ctx->XMLhandler->fatalError(ctx, __VA_ARGS__); \
  	} else { \
  	    fprintf(stderr, "Unhandled fatal error: "); fprintf(stderr, __VA_ARGS__); \
--- 99,104 ----
  
  #define XMLhandleFatalError(ctx, ...) \
! 	if ((ctx)->XMLhandler->fatalError) { \
! 	    (ctx)->XMLhandler->fatalError((ctx), __VA_ARGS__); \
  	} else { \
  	    fprintf(stderr, "Unhandled fatal error: "); fprintf(stderr, __VA_ARGS__); \
***************
*** 106,111 ****
  
  #define XMLhandleError(ctx, ...) \
! 	if (ctx->XMLhandler->error) { \
! 	    ctx->XMLhandler->error(ctx, __VA_ARGS__); \
  	} else { \
  	    fprintf(stderr, "Unhandled error: "); fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); \
--- 107,112 ----
  
  #define XMLhandleError(ctx, ...) \
! 	if ((ctx)->XMLhandler->error) { \
! 	    (ctx)->XMLhandler->error(ctx, __VA_ARGS__); \
  	} else { \
  	    fprintf(stderr, "Unhandled error: "); fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); \