cvs commit: patches/expat expat-1.95.6-fix_declaration_order-1.patch expat-1.95.6-fix-declaration-order.patch

jim at linuxfromscratch.org jim at linuxfromscratch.org
Fri Jun 4 08:45:19 PDT 2004


jim         04/06/04 09:45:19

  Added:       expat    expat-1.95.6-fix_declaration_order-1.patch
  Removed:     expat    expat-1.95.6-fix-declaration-order.patch
  Log:
  Naming Scheme Update
  
  Revision  Changes    Path
  1.1                  patches/expat/expat-1.95.6-fix_declaration_order-1.patch
  
  Index: expat-1.95.6-fix_declaration_order-1.patch
  ===================================================================
  Submitted By: BLFS BOOK <blfs-book at linuxfromscratch.org>
  Date: 2003-10-03
  Initial Package Version: 1.95.6
  Origin: NA
  Description: Defines were messed up, expat.h uses XML_Status before
  it is used.
  diff -ur expat-1.95.6.orig/lib/expat.h expat-1.95.6/lib/expat.h
  --- expat-1.95.6.orig/lib/expat.h	2003-01-16 16:03:42.000000000 -0600
  +++ expat-1.95.6/lib/expat.h	2003-01-31 00:39:38.000000000 -0600
  @@ -647,6 +647,32 @@
   /* Returns the last value set by XML_SetUserData or NULL. */
   #define XML_GetUserData(parser) (*(void **)(parser))
   
  +/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
  +   detected.  The last call to XML_Parse must have isFinal true; len
  +   may be zero for this call (or any other).
  +
  +   The XML_Status enum gives the possible return values for the
  +   XML_Parse and XML_ParseBuffer functions.  Though the return values
  +   for these functions has always been described as a Boolean value,
  +   the implementation, at least for the 1.95.x series, has always
  +   returned exactly one of these values.  The preprocessor #defines
  +   are included so this stanza can be added to code that still needs
  +   to support older versions of Expat 1.95.x:
  +
  +   #ifndef XML_STATUS_OK
  +   #define XML_STATUS_OK    1
  +   #define XML_STATUS_ERROR 0
  +   #endif
  +
  +   Otherwise, the #define hackery is quite ugly and would have been dropped.
  +*/
  +enum XML_Status {
  +  XML_STATUS_ERROR = 0,
  +#define XML_STATUS_ERROR XML_STATUS_ERROR
  +  XML_STATUS_OK = 1
  +#define XML_STATUS_OK XML_STATUS_OK
  +};
  +
   /* This is equivalent to supplying an encoding argument to
      XML_ParserCreate. On success XML_SetEncoding returns non-zero,
      zero otherwise.
  @@ -713,32 +739,6 @@
   XMLPARSEAPI(int)
   XML_GetIdAttributeIndex(XML_Parser parser);
   
  -/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
  -   detected.  The last call to XML_Parse must have isFinal true; len
  -   may be zero for this call (or any other).
  -
  -   The XML_Status enum gives the possible return values for the
  -   XML_Parse and XML_ParseBuffer functions.  Though the return values
  -   for these functions has always been described as a Boolean value,
  -   the implementation, at least for the 1.95.x series, has always
  -   returned exactly one of these values.  The preprocessor #defines
  -   are included so this stanza can be added to code that still needs
  -   to support older versions of Expat 1.95.x:
  -
  -   #ifndef XML_STATUS_OK
  -   #define XML_STATUS_OK    1
  -   #define XML_STATUS_ERROR 0
  -   #endif
  -
  -   Otherwise, the #define hackery is quite ugly and would have been dropped.
  -*/
  -enum XML_Status {
  -  XML_STATUS_ERROR = 0,
  -#define XML_STATUS_ERROR XML_STATUS_ERROR
  -  XML_STATUS_OK = 1
  -#define XML_STATUS_OK XML_STATUS_OK
  -};
  -
   XMLPARSEAPI(enum XML_Status)
   XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
   
  
  
  



More information about the patches mailing list