blob: d9a59e429feafb9b41d76682518051db80132dd9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
diff -ruN sim-0.9.5-svn20080806-dfsg.orig/sim/sim.cpp sim-0.9.5-svn20080806-dfsg/sim/sim.cpp
--- sim-0.9.5-svn20080806-dfsg.orig/sim/sim.cpp 2015-08-15 15:03:08.548399072 +0300
+++ sim-0.9.5-svn20080806-dfsg/sim/sim.cpp 2007-12-31 19:14:38.000000000 +0300
@@ -290,9 +290,6 @@
#else
SimApp app(_argc, _argv);
#endif
-#if !defined(QT_MACOSX_VERSION) && !defined(QT_MAC) && !defined(__OS2__)
- old_errhandler = XSetErrorHandler(x_errhandler);
-#endif
#else
for (int i = 0; i < argc; i++){
QCString arg = argv[i];
diff -ruN sim-0.9.5-svn20080806-dfsg.orig/sim/xsl.cpp sim-0.9.5-svn20080806-dfsg/sim/xsl.cpp
--- sim-0.9.5-svn20080806-dfsg.orig/sim/xsl.cpp 2015-08-15 15:03:08.548399072 +0300
+++ sim-0.9.5-svn20080806-dfsg/sim/xsl.cpp 2006-12-18 21:49:50.000000000 +0300
@@ -21,6 +21,11 @@
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
+#ifndef LIBXML2_NEW_BUFFER
+#define xmlBufContent(buf) ((buf)->content)
+#define xmlBufUse(buf) ((buf)->use)
+#endif
+
#include <qfile.h>
#include <qregexp.h>
@@ -128,7 +123,7 @@
xsltSaveResultTo(buf, res, d->styleSheet);
xmlFreeDoc(res);
- QString result = QString::fromUtf8((char*)(buf->buffer->content));
+ QString result = QString::fromUtf8((char*)(xmlBufContent(buf->buffer)));
xmlOutputBufferClose(buf);;
return result;
|