[Expat-checkins] expat/lib xmlparse.c,1.35,1.36 xmlrole.c,1.5,1.6 xmltok.c,1.12,1.13

[gstein@users.sourceforge.net]

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv21322/lib

Modified Files:
	xmlparse.c xmlrole.c xmltok.c 
Log Message:
Various configuration fixes, focused primarily around expat_config.h
(which used to be called config.h)

* configure.in:
  - change the header name to expat_config.h to prevent any possible
    conflict with some other packages 'config.h'
  - add a prerequisite on autoconf 2.50 or newer
  - shift some acconfig.h values to AC_DEFINE() values

* MANIFEST:
  - rename config.h.in to expat_config.h.in

* Makefile.in:
  - clean out expat_config.h* instead of config.h*

* acconfig.h:
  - remove the XML_NS, XML_DTD, and XML_CONTEXT_BYTES symbols; they
    are now defined directly by configure.in
  - shift the memmove() compatibility to xmlparse.c, its only consumer
  - remove the @BOTTOM@ part since there are no more values to put at
    the bottom of expat_config.h.in via acconfig.h

* xmlparse.c:
  - switch from config.h to expat_config.h
  - insert macro to define memmove() if it isn't available, but
    bcopy() is available. also, changed one branch to #error rather
    than insert bogus code.

* xmlrole.c:
  - tweak the copyright header, per Fred-ism
  - remove the unused RCSId[] variable (no other file has these)
  - switch from config.h to expat_config.h

* xmltok.c:
  - switch from config.h to expat_config.h



Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** xmlparse.c	17 May 2002 15:21:53 -0000	1.35
--- xmlparse.c	17 May 2002 21:30:07 -0000	1.36
***************
*** 1,5 ****
! /*
! Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
--- 1,4 ----
! /* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
!    See the file COPYING for copying permission.
  */
  
***************
*** 10,14 ****
  #  undef XMLPARSEAPI
  #else
! #include <config.h>
  
  #ifdef __declspec
--- 9,13 ----
  #  undef XMLPARSEAPI
  #else
! #include <expat_config.h>
  
  #ifdef __declspec
***************
*** 74,77 ****
--- 73,85 ----
  /* Round up n to be a multiple of sz, where sz is a power of 2. */
  #define ROUND_UP(n, sz) (((n) + ((sz) - 1)) & ~((sz) - 1))
+ 
+ /* Handle the case where memmove() doesn't exist. */
+ #ifndef HAVE_MEMMOVE
+ #ifdef HAVE_BCOPY
+ #define memmove(d,s,l) bcopy((s),(d),(l))
+ #else
+ #error memmove does not exist on this platform, nor is a substitute available
+ #endif /* HAVE_BCOPY */
+ #endif /* HAVE_MEMMOVE */
  
  #include "xmltok.h"

Index: xmlrole.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlrole.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xmlrole.c	22 Oct 2000 19:20:23 -0000	1.5
--- xmlrole.c	17 May 2002 21:30:07 -0000	1.6
***************
*** 1,14 ****
! /*
! Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
- static char RCSId[]
-   = "$Header$";
- 
  #ifdef COMPILED_FROM_DSP
  #  include "winconfig.h"
  #else
! #  include <config.h>
  #endif /* ndef COMPILED_FROM_DSP */
  
--- 1,10 ----
! /* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
!    See the file COPYING for copying permission.
  */
  
  #ifdef COMPILED_FROM_DSP
  #  include "winconfig.h"
  #else
! #  include <expat_config.h>
  #endif /* ndef COMPILED_FROM_DSP */
  

Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** xmltok.c	17 May 2002 18:47:53 -0000	1.12
--- xmltok.c	17 May 2002 21:30:07 -0000	1.13
***************
*** 6,10 ****
  #  include "winconfig.h"
  #else
! #  include <config.h>
  #endif /* ndef COMPILED_FROM_DSP */
  
--- 6,10 ----
  #  include "winconfig.h"
  #else
! #  include <expat_config.h>
  #endif /* ndef COMPILED_FROM_DSP */