118 lines
4.2 KiB
Diff
118 lines
4.2 KiB
Diff
diff -ru xmlcopyeditor-1.2.0.2.orig/src/replace.cpp xmlcopyeditor-1.2.0.2/src/replace.cpp
|
|
--- xmlcopyeditor-1.2.0.2.orig/src/replace.cpp 2009-06-30 10:38:57.000000000 +0100
|
|
+++ xmlcopyeditor-1.2.0.2/src/replace.cpp 2009-06-30 10:43:13.000000000 +0100
|
|
@@ -18,6 +18,7 @@
|
|
*/
|
|
|
|
#include <cstring>
|
|
+#include <cstdio>
|
|
#include "replace.h"
|
|
|
|
int Replace::run (
|
|
diff -ru xmlcopyeditor-1.2.0.2.orig/src/stringset.h xmlcopyeditor-1.2.0.2/src/stringset.h
|
|
--- xmlcopyeditor-1.2.0.2.orig/src/stringset.h 2009-06-30 10:38:57.000000000 +0100
|
|
+++ xmlcopyeditor-1.2.0.2/src/stringset.h 2009-06-30 10:40:40.000000000 +0100
|
|
@@ -28,6 +28,7 @@
|
|
#ifdef __WXMSW__
|
|
#include <mem.h>
|
|
#endif
|
|
+#include <stdint.h>
|
|
|
|
template<class T>
|
|
class StringSetNode
|
|
diff -ru xmlcopyeditor-1.2.0.2.orig/src/wrapaspell.cpp xmlcopyeditor-1.2.0.2/src/wrapaspell.cpp
|
|
--- xmlcopyeditor-1.2.0.2.orig/src/wrapaspell.cpp 2009-06-30 10:38:57.000000000 +0100
|
|
+++ xmlcopyeditor-1.2.0.2/src/wrapaspell.cpp 2009-06-30 11:12:37.000000000 +0100
|
|
@@ -19,6 +19,7 @@
|
|
|
|
#include <iostream>
|
|
#include <stdexcept>
|
|
+#include <cstdio>
|
|
#include "wrapaspell.h"
|
|
#include "aspell.h"
|
|
#include "casehandler.h"
|
|
diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatedtd.h xmlcopyeditor-1.2.0.2/src/xmlassociatedtd.h
|
|
--- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatedtd.h 2009-06-30 10:38:57.000000000 +0100
|
|
+++ xmlcopyeditor-1.2.0.2/src/xmlassociatedtd.h 2009-06-30 11:04:26.000000000 +0100
|
|
@@ -24,6 +24,7 @@
|
|
#include <expat.h>
|
|
#include <string>
|
|
#include <memory>
|
|
+#include <cstdio>
|
|
#include "wrapexpat.h"
|
|
|
|
struct DtdData : public ParserData
|
|
diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsd.h xmlcopyeditor-1.2.0.2/src/xmlassociatexsd.h
|
|
--- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsd.h 2009-06-30 10:38:57.000000000 +0100
|
|
+++ xmlcopyeditor-1.2.0.2/src/xmlassociatexsd.h 2009-06-30 11:05:29.000000000 +0100
|
|
@@ -25,6 +25,7 @@
|
|
#include <string>
|
|
#include <map>
|
|
#include <memory>
|
|
+#include <cstdio>
|
|
#include "wrapexpat.h"
|
|
|
|
struct AssociateXsdData : public ParserData
|
|
diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsl.h xmlcopyeditor-1.2.0.2/src/xmlassociatexsl.h
|
|
--- xmlcopyeditor-1.2.0.2.orig/src/xmlassociatexsl.h 2009-06-30 10:38:57.000000000 +0100
|
|
+++ xmlcopyeditor-1.2.0.2/src/xmlassociatexsl.h 2009-06-30 11:05:55.000000000 +0100
|
|
@@ -24,6 +24,7 @@
|
|
#include <expat.h>
|
|
#include <string>
|
|
#include <memory>
|
|
+#include <cstdio>
|
|
#include "wrapexpat.h"
|
|
|
|
struct XslData : public ParserData
|
|
diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlpromptgenerator.cpp xmlcopyeditor-1.2.0.2/src/xmlpromptgenerator.cpp
|
|
--- xmlcopyeditor-1.2.0.2.orig/src/xmlpromptgenerator.cpp 2009-06-30 10:38:57.000000000 +0100
|
|
+++ xmlcopyeditor-1.2.0.2/src/xmlpromptgenerator.cpp 2009-06-30 11:23:56.000000000 +0100
|
|
@@ -31,7 +31,6 @@
|
|
#include "catalogresolver.h"
|
|
|
|
// Xerces-C req'd for Schema parsing
|
|
-#define XERCES_TMPLSINC
|
|
|
|
#include <xercesc/util/NameIdPool.hpp>
|
|
#include <xercesc/util/PlatformUtils.hpp>
|
|
@@ -441,7 +440,7 @@
|
|
}
|
|
|
|
SchemaGrammar* grammar = ( SchemaGrammar* ) rootGrammar;
|
|
- RefHash3KeysIdPoolEnumerator<SchemaElementDecl> elemEnum = grammar->getElemEnumerator();
|
|
+ RefHash3KeysIdPoolEnumerator<SchemaElementDecl> elemEnum (grammar->getElemEnumerator());
|
|
|
|
if ( !elemEnum.hasMoreElements() )
|
|
{
|
|
diff -ru xmlcopyeditor-1.2.0.2.orig/src/xmlutf8reader.h xmlcopyeditor-1.2.0.2/src/xmlutf8reader.h
|
|
--- xmlcopyeditor-1.2.0.2.orig/src/xmlutf8reader.h 2009-06-30 10:38:57.000000000 +0100
|
|
+++ xmlcopyeditor-1.2.0.2/src/xmlutf8reader.h 2009-06-30 11:08:20.000000000 +0100
|
|
@@ -24,6 +24,7 @@
|
|
#include <expat.h>
|
|
#include <string>
|
|
#include <memory>
|
|
+#include <cstdio>
|
|
#include "wrapexpat.h"
|
|
|
|
struct UtfData : public ParserData
|
|
diff -ru xmlcopyeditor-1.2.0.2.orig/src/xsllocator.cpp xmlcopyeditor-1.2.0.2/src/xsllocator.cpp
|
|
--- xmlcopyeditor-1.2.0.2.orig/src/xsllocator.cpp 2009-06-30 10:38:57.000000000 +0100
|
|
+++ xmlcopyeditor-1.2.0.2/src/xsllocator.cpp 2009-06-30 11:11:23.000000000 +0100
|
|
@@ -46,7 +46,7 @@
|
|
return;
|
|
|
|
char *value, *iterator;
|
|
- value = strstr ( ( const char * ) data, "href=" );
|
|
+ value = strstr ( ( char * ) data, "href=" );
|
|
if ( !value || strlen ( value ) < 7 )
|
|
return;
|
|
value += 6;
|
|
@@ -55,7 +55,7 @@
|
|
{
|
|
if ( *iterator == '"' || *iterator == '\'' )
|
|
{
|
|
- *iterator = '\0';
|
|
+ *iterator = '\0'; //bustage, modifying const *data
|
|
break;
|
|
}
|
|
}
|