|
0 |
Index: gtkmathview-0.8.0/src/widget/gtkmathview_common.h
|
|
1 |
===================================================================
|
|
2 |
--- gtkmathview-0.8.0.orig/src/widget/gtkmathview_common.h
|
|
3 |
+++ gtkmathview-0.8.0/src/widget/gtkmathview_common.h
|
|
4 |
@@ -22,6 +22,17 @@
|
|
5 |
|
|
6 |
#include <gtk/gtkwidget.h>
|
|
7 |
|
|
8 |
+/* Include these outside the extern "c" bit */
|
|
9 |
+#if GTKMATHVIEW_USES_CUSTOM_READER
|
|
10 |
+#include "c_customXmlReader.h"
|
|
11 |
+#elif GTKMATHVIEW_USES_LIBXML2_READER
|
|
12 |
+#include <libxml/xmlreader.h>
|
|
13 |
+#elif GTKMATHVIEW_USES_LIBXML2
|
|
14 |
+#include <libxml/tree.h>
|
|
15 |
+#elif GTKMATHVIEW_USES_GMETADOM
|
|
16 |
+#include <gdome.h>
|
|
17 |
+#endif
|
|
18 |
+
|
|
19 |
#ifdef __cplusplus
|
|
20 |
extern "C" {
|
|
21 |
#endif /* __cplusplus */
|
|
22 |
@@ -45,23 +56,19 @@ extern "C" {
|
|
23 |
typedef void* GtkMathViewReaderData;
|
|
24 |
|
|
25 |
#if GTKMATHVIEW_USES_CUSTOM_READER
|
|
26 |
-#include "c_customXmlReader.h"
|
|
27 |
#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##custom_reader
|
|
28 |
typedef void* GtkMathViewModelId;
|
|
29 |
typedef const char* GtkMathViewModelString;
|
|
30 |
#elif GTKMATHVIEW_USES_LIBXML2_READER
|
|
31 |
-#include <libxml/xmlreader.h>
|
|
32 |
#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2_reader
|
|
33 |
typedef void* GtkMathViewModelId;
|
|
34 |
typedef const xmlChar* GtkMathViewModelString;
|
|
35 |
#elif GTKMATHVIEW_USES_LIBXML2
|
|
36 |
-#include <libxml/tree.h>
|
|
37 |
#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2
|
|
38 |
typedef xmlElement* GtkMathViewModelId;
|
|
39 |
typedef xmlDoc* GtkMathViewModelDocument;
|
|
40 |
typedef const xmlChar* GtkMathViewModelString;
|
|
41 |
#elif GTKMATHVIEW_USES_GMETADOM
|
|
42 |
-#include <gdome.h>
|
|
43 |
#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##gmetadom
|
|
44 |
typedef GdomeElement* GtkMathViewModelId;
|
|
45 |
typedef GdomeDocument* GtkMathViewModelDocument;
|