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 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92
|
From: Daniel Glassey <wdg@debian.org>
Date: Thu, 1 Nov 2018 10:27:07 +0100
Subject: allow abi-compliance-checker to compile headers
---
include/canon_abbrevs.h | 2 ++
include/femain.h | 5 ++++-
include/hebrewmcim.h | 4 ++--
include/sapphire.h | 5 +++++
include/zcom.h | 1 +
5 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/include/canon_abbrevs.h b/include/canon_abbrevs.h
index 5a6c963..cab19ef 100644
--- a/include/canon_abbrevs.h
+++ b/include/canon_abbrevs.h
@@ -24,6 +24,8 @@
#ifndef CANON_ABBREVS_H
#define CANON_ABBREVS_H
+#include <versificationmgr.h>
+
SWORD_NAMESPACE_START
diff --git a/include/femain.h b/include/femain.h
index 7872bc5..6c087cb 100644
--- a/include/femain.h
+++ b/include/femain.h
@@ -24,11 +24,14 @@
#ifndef FEMAIN_H
#define FEMAIN_H
+#include <list>
+#include <swdisp.h>
+
class FEMain {
public:
FEMain();
virtual ~FEMain();
- list<SWDisplay *> displays; // so we can delete each display we create
+ std::list < sword::SWDisplay *> displays; // so we can delete each display we create
};
#endif
diff --git a/include/hebrewmcim.h b/include/hebrewmcim.h
index 8413e62..f5afd34 100644
--- a/include/hebrewmcim.h
+++ b/include/hebrewmcim.h
@@ -44,8 +44,8 @@ class SWDLLEXPORT HebrewMCIM : public SWInputMethod {
private:
void init();
int subst[255];
- map<int, int> subst2[12];
- map<int, int*> multiChars;
+ std::map<int, int> subst2[12];
+ std::map<int, int*> multiChars;
public:
HebrewMCIM();
diff --git a/include/sapphire.h b/include/sapphire.h
index a2dae27..a167864 100644
--- a/include/sapphire.h
+++ b/include/sapphire.h
@@ -38,6 +38,9 @@
* & 0xFF or % 0x100, whichever is faster.
*/
+#ifndef SAPPHIRE_H
+#define SAPPHIRE_H
+
#ifndef NULL
#define NULL 0
#endif
@@ -83,3 +86,5 @@ public:
SWORD_NAMESPACE_END
+
+#endif //SAPPHIRE_H
diff --git a/include/zcom.h b/include/zcom.h
index ff994a6..956efbc 100644
--- a/include/zcom.h
+++ b/include/zcom.h
@@ -25,6 +25,7 @@
#define ZCOM_H
#include <swcom.h>
+#include <zverse.h>
#include <defs.h>
|