[Expat-checkins] expat/lib winconfig.h,1.1,1.2 xmltok.c,1.13,1.14 xmltok_ns.c,1.2,1.3

[gstein@users.sourceforge.net]

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

Modified Files:
	winconfig.h xmltok.c xmltok_ns.c 
Log Message:
Remove acconfig.h altogether by removing XML_BYTE_ORDER. We can simply
use the BYTEORDER constant that ac_c_bigendian_cross.m4 generates.

* accconfig.h: removed; obsolete.

* lib/winconfig.h:
  - set the BYTEORDER constant, rather than XML_BYTE_ORDER, and leave
    a note about what we're assuming.

* lib/xmltok.c, lib/xmltok_ns.c:
  - change all XML_BYTE_ORDER references to BYTEORDER, and
    update the constants from 12, 21 to 1234, 4321 respectively.



Index: winconfig.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/winconfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** winconfig.h	22 Oct 2000 19:20:23 -0000	1.1
--- winconfig.h	17 May 2002 21:42:05 -0000	1.2
***************
*** 6,11 ****
  ** it under the terms of the MIT/X license (contained in the COPYING file
  ** with this distribution.)
- **
- **
  */
  
--- 6,9 ----
***************
*** 22,27 ****
  #define XML_NS 1
  #define XML_DTD 1
- #define XML_BYTE_ORDER 12
  #define XML_CONTEXT_BYTES 1024
  
  #endif /* ndef WINCONFIG_H */
--- 20,27 ----
  #define XML_NS 1
  #define XML_DTD 1
  #define XML_CONTEXT_BYTES 1024
+ 
+ /* we will assume all Windows platforms are little endian */
+ #define BYTEORDER 1234
  
  #endif /* ndef WINCONFIG_H */

Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** xmltok.c	17 May 2002 21:30:07 -0000	1.13
--- xmltok.c	17 May 2002 21:42:05 -0000	1.14
***************
*** 658,662 ****
  static const struct normal_encoding little2_encoding_ns = { 
    { VTABLE, 2, 0,
! #if XML_BYTE_ORDER == 12
      1
  #else
--- 658,662 ----
  static const struct normal_encoding little2_encoding_ns = { 
    { VTABLE, 2, 0,
! #if BYTEORDER == 1234
      1
  #else
***************
*** 675,679 ****
  static const struct normal_encoding little2_encoding = { 
    { VTABLE, 2, 0,
! #if XML_BYTE_ORDER == 12
      1
  #else
--- 675,679 ----
  static const struct normal_encoding little2_encoding = { 
    { VTABLE, 2, 0,
! #if BYTEORDER == 1234
      1
  #else
***************
*** 690,694 ****
  };
  
! #if XML_BYTE_ORDER != 21
  
  #ifdef XML_NS
--- 690,694 ----
  };
  
! #if BYTEORDER != 4321
  
  #ifdef XML_NS
***************
*** 797,801 ****
  static const struct normal_encoding big2_encoding_ns = {
    { VTABLE, 2, 0,
! #if XML_BYTE_ORDER == 21
    1
  #else
--- 797,801 ----
  static const struct normal_encoding big2_encoding_ns = {
    { VTABLE, 2, 0,
! #if BYTEORDER == 4321
    1
  #else
***************
*** 814,818 ****
  static const struct normal_encoding big2_encoding = {
    { VTABLE, 2, 0,
! #if XML_BYTE_ORDER == 21
    1
  #else
--- 814,818 ----
  static const struct normal_encoding big2_encoding = {
    { VTABLE, 2, 0,
! #if BYTEORDER == 4321
    1
  #else
***************
*** 829,833 ****
  };
  
! #if XML_BYTE_ORDER != 12
  
  #ifdef XML_NS
--- 829,833 ----
  };
  
! #if BYTEORDER != 1234
  
  #ifdef XML_NS

Index: xmltok_ns.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok_ns.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xmltok_ns.c	21 Sep 2000 21:20:18 -0000	1.2
--- xmltok_ns.c	17 May 2002 21:42:05 -0000	1.3
***************
*** 6,12 ****
  const ENCODING *NS(XmlGetUtf16InternalEncoding)(void)
  {
! #if XML_BYTE_ORDER == 12
    return &ns(internal_little2_encoding).enc;
! #elif XML_BYTE_ORDER == 21
    return &ns(internal_big2_encoding).enc;
  #else
--- 6,12 ----
  const ENCODING *NS(XmlGetUtf16InternalEncoding)(void)
  {
! #if BYTEORDER == 1234
    return &ns(internal_little2_encoding).enc;
! #elif BYTEORDER == 4321
    return &ns(internal_big2_encoding).enc;
  #else