Commit [e70542] Maximize Restore History

Commit

Andrea Mazzoleni Andrea Mazzoleni 2004-04-18

1 2 > >> (Page 1 of 2)
added expat/expatcfg.h
removed expat/intexpat.h
changed doc/advscan.1
changed doc/advscan.d
changed doc/advscan.html
changed doc/advscan.txt
changed doc/authors.d
changed doc/authors.html
changed doc/authors.txt
changed doc/history.1
changed doc/history.d
changed doc/history.html
changed doc/history.txt
changed doc/install.1
changed doc/install.d
changed doc/install.html
changed doc/install.txt
changed expat/README
changed expat/expat.h
changed expat/xmlparse.c
changed expat/xmlrole.c
changed expat/xmltok.c
changed expat/xmltok_impl.c
copied expat/expat-1.95.6.diff -> expat/expat-1.95.7.diff
expat/expatcfg.h Diff Switch to side-by-side view
Loading...
expat/intexpat.h
File was removed.
doc/advscan.1 Diff Switch to side-by-side view
Loading...
doc/advscan.d Diff Switch to side-by-side view
Loading...
doc/advscan.html Diff Switch to side-by-side view
Loading...
doc/advscan.txt Diff Switch to side-by-side view
Loading...
doc/authors.d Diff Switch to side-by-side view
Loading...
doc/authors.html Diff Switch to side-by-side view
Loading...
doc/authors.txt Diff Switch to side-by-side view
Loading...
doc/history.1 Diff Switch to side-by-side view
Loading...
doc/history.d Diff Switch to side-by-side view
Loading...
doc/history.html Diff Switch to side-by-side view
Loading...
doc/history.txt Diff Switch to side-by-side view
Loading...
doc/install.1 Diff Switch to side-by-side view
Loading...
doc/install.d Diff Switch to side-by-side view
Loading...
doc/install.html Diff Switch to side-by-side view
Loading...
doc/install.txt Diff Switch to side-by-side view
Loading...
expat/README Diff Switch to side-by-side view
Loading...
expat/expat.h Diff Switch to side-by-side view
Loading...
expat/xmlparse.c Diff Switch to side-by-side view
Loading...
expat/xmlrole.c Diff Switch to side-by-side view
Loading...
expat/xmltok.c Diff Switch to side-by-side view
Loading...
expat/xmltok_impl.c Diff Switch to side-by-side view
Loading...
expat/expat-1.95.6.diff to expat/expat-1.95.7.diff
--- a/expat/expat-1.95.6.diff
+++ b/expat/expat-1.95.7.diff
@@ -1,40 +1,7 @@
-diff -u --recursive --new-file expat-1.95.6/expat.h expat-int/expat.h
---- expat-1.95.6/expat.h	2003-01-16 23:03:42.000000000 +0100
-+++ expat-int/expat.h	2003-06-15 17:22:55.000000000 +0200
-@@ -103,6 +103,13 @@
-   XML_CQUANT_PLUS
- };
- 
-+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
-+};
-+
- /* If type == XML_CTYPE_EMPTY or XML_CTYPE_ANY, then quant will be
-    XML_CQUANT_NONE, and the other fields will be zero or NULL.
-    If type == XML_CTYPE_MIXED, then quant will be NONE or REP and
-@@ -732,12 +739,6 @@
- 
-    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);
-diff -u --recursive --new-file expat-1.95.6/intconfig.h expat-int/intconfig.h
---- expat-1.95.6/intconfig.h	1970-01-01 01:00:00.000000000 +0100
-+++ expat-int/intconfig.h	2003-07-14 23:00:10.000000000 +0200
-@@ -0,0 +1,25 @@
-+#ifndef INTCONFIG_H
-+#define INTCONFIG_H
-+
+diff --new-file -u expat-1.95.7/expatcfg.h expat/expatcfg.h
+--- expat-1.95.7/expatcfg.h	1970-01-01 01:00:00.000000000 +0100
++++ expat/expatcfg.h	2004-04-13 15:58:30.000000000 +0200
+@@ -0,0 +1,21 @@
 +#include <stdlib.h>
 +#include <string.h>
 +
@@ -56,25 +23,27 @@
 +
 +#undef XMLPARSEAPI
 +
-+#endif
-diff -u --recursive --new-file expat-1.95.6/internal.h expat-int/internal.h
---- expat-1.95.6/internal.h	2002-09-20 05:42:43.000000000 +0200
-+++ expat-int/internal.h	2003-07-14 23:02:36.000000000 +0200
+diff --new-file -u expat-1.95.7/internal.h expat/internal.h
+--- expat-1.95.7/internal.h	2003-09-28 23:57:22.000000000 +0200
++++ expat/internal.h	2003-08-30 15:58:25.000000000 +0200
 @@ -20,54 +20,7 @@
           and therefore subject to change.
  */
  
--#if defined(__GNUC__)
--/* Instability reported with egcs on a RedHat Linux 7.3.
--   Let's comment it out:
+-#if defined(__GNUC__) && defined(__i386__)
+-/* We'll use this version by default only where we know it helps.
+-
+-   regparm() generates warnings on Solaris boxes.   See SF bug #692878.
+-
+-   Instability reported with egcs on a RedHat Linux 7.3.
+-   Let's comment out:
 -   #define FASTCALL __attribute__((stdcall, regparm(3)))
 -   and let's try this:
 -*/
 -#define FASTCALL __attribute__((regparm(3)))
--#define PTRCALL
 -#define PTRFASTCALL __attribute__((regparm(3)))
+-#endif
 -
--#elif defined(WIN32)
 -/* Using __fastcall seems to have an unexpected negative effect under
 -   MS VC++, especially for function pointers, so we won't use it for
 -   now on that platform. It may be reconsidered for a future release
@@ -82,11 +51,8 @@
 -   Likely reason: __fastcall on Windows is like stdcall, therefore
 -   the compiler cannot perform stack optimizations for call clusters.
 -*/
--#define FASTCALL
--#define PTRCALL
--#define PTRFASTCALL
 -
--#endif
+-/* Make sure all of these are defined if they aren't already. */
 -
 -#ifndef FASTCALL
  #define FASTCALL
@@ -115,57 +81,30 @@
 -#define inline
 -#endif
 -#endif
-diff -u --recursive --new-file expat-1.95.6/intexpat.h expat-int/intexpat.h
---- expat-1.95.6/intexpat.h	1970-01-01 01:00:00.000000000 +0100
-+++ expat-int/intexpat.h	2003-08-20 22:44:28.000000000 +0200
-@@ -0,0 +1,6 @@
-+#ifndef INTEXPAT_H
-+#define INTEXPAT_H
-+
-+#include "expat.h"
-+
-+#endif
-diff -u --recursive --new-file expat-1.95.6/xmlparse.c expat-int/xmlparse.c
---- expat-1.95.6/xmlparse.c	2003-01-28 06:45:10.000000000 +0100
-+++ expat-int/xmlparse.c	2003-06-15 17:22:55.000000000 +0200
-@@ -5,32 +5,7 @@
- #include <stddef.h>
- #include <string.h>                     /* memset(), memcpy() */
+diff --new-file -u expat-1.95.7/xmlparse.c expat/xmlparse.c
+--- expat-1.95.7/xmlparse.c	2003-10-18 06:46:02.000000000 +0200
++++ expat/xmlparse.c	2004-04-13 16:02:16.000000000 +0200
+@@ -7,15 +7,7 @@
+ 
+ #define XML_BUILDING_EXPAT 1
  
 -#ifdef COMPILED_FROM_DSP
--
 -#include "winconfig.h"
--#define XMLPARSEAPI(type) type __cdecl
--#include "expat.h"
--#undef XMLPARSEAPI
--
 -#elif defined(MACOS_CLASSIC)
--
 -#include "macconfig.h"
--#include "expat.h"
--
 -#else
--
+-#ifdef HAVE_EXPAT_CONFIG_H
 -#include <expat_config.h>
--
--#ifdef __declspec
--#define XMLPARSEAPI(type) type __cdecl
--#endif
--
--#include "expat.h"
--
--#ifdef __declspec
--#undef XMLPARSEAPI
 -#endif
 -#endif /* ndef COMPILED_FROM_DSP */
-+#include "intconfig.h"
++#include "expatcfg.h"
  
- #ifdef XML_UNICODE
- #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX
-diff -u --recursive --new-file expat-1.95.6/xmlrole.c expat-int/xmlrole.c
---- expat-1.95.6/xmlrole.c	2002-09-20 05:42:43.000000000 +0200
-+++ expat-int/xmlrole.c	2003-06-15 17:22:55.000000000 +0200
-@@ -2,13 +2,7 @@
+ #include "expat.h"
+ 
+diff --new-file -u expat-1.95.7/xmlrole.c expat/xmlrole.c
+--- expat-1.95.7/xmlrole.c	2003-10-16 06:51:11.000000000 +0200
++++ expat/xmlrole.c	2004-04-13 16:02:03.000000000 +0200
+@@ -2,15 +2,7 @@
     See the file COPYING for copying permission.
  */
  
@@ -174,16 +113,18 @@
 -#elif defined(MACOS_CLASSIC)
 -#include "macconfig.h"
 -#else
+-#ifdef HAVE_EXPAT_CONFIG_H
 -#include <expat_config.h>
+-#endif
 -#endif /* ndef COMPILED_FROM_DSP */
-+#include "intconfig.h"
++#include "expatcfg.h"
  
  #include "internal.h"
  #include "xmlrole.h"
-diff -u --recursive --new-file expat-1.95.6/xmltok.c expat-int/xmltok.c
---- expat-1.95.6/xmltok.c	2002-12-14 04:12:18.000000000 +0100
-+++ expat-int/xmltok.c	2003-06-15 17:22:55.000000000 +0200
-@@ -2,13 +2,7 @@
+diff --new-file -u expat-1.95.7/xmltok.c expat/xmltok.c
+--- expat-1.95.7/xmltok.c	2003-10-16 06:51:11.000000000 +0200
++++ expat/xmltok.c	2004-04-13 16:01:53.000000000 +0200
+@@ -2,15 +2,7 @@
     See the file COPYING for copying permission.
  */
  
@@ -192,9 +133,11 @@
 -#elif defined(MACOS_CLASSIC)
 -#include "macconfig.h"
 -#else
+-#ifdef HAVE_EXPAT_CONFIG_H
 -#include <expat_config.h>
+-#endif
 -#endif /* ndef COMPILED_FROM_DSP */
-+#include "intconfig.h"
++#include "expatcfg.h"
  
  #include "internal.h"
  #include "xmltok.h"
1 2 > >> (Page 1 of 2)