summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Glassey <wdg@debian.org>2018-11-01 10:27:07 +0100
committerDaniel Glassey <wdg@debian.org>2018-11-12 23:05:48 +0700
commit8de5f79443fdfeb131c3b56d14121889906d89e2 (patch)
treea7d00bc95a8a3ebaf6c070584b687c23ce0e1de7
parent052bbc4007d2fb33ce3252fcf78c8f0fbbd1d730 (diff)
allow abi-compliance-checker to compile headers
Gbp-Pq: Name 0002-abicompare.patch
-rw-r--r--include/canon_abbrevs.h2
-rw-r--r--include/femain.h5
-rw-r--r--include/hebrewmcim.h4
-rw-r--r--include/sapphire.h5
-rw-r--r--include/zcom.h1
5 files changed, 14 insertions, 3 deletions
diff --git a/include/canon_abbrevs.h b/include/canon_abbrevs.h
index a5fc320..60dea94 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 3eec2c6..01c0042 100644
--- a/include/femain.h
+++ b/include/femain.h
@@ -23,12 +23,15 @@
#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 ffcb9a1..43b97b3 100644
--- a/include/hebrewmcim.h
+++ b/include/hebrewmcim.h
@@ -42,8 +42,8 @@ class SWDLLEXPORT HebrewMCIM : public SWInputMethod {
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 96f3bf5..20aa53d 100644
--- a/include/sapphire.h
+++ b/include/sapphire.h
@@ -37,6 +37,9 @@
* results of assignments need to be reduced to 8 bits with
* & 0xFF or % 0x100, whichever is faster.
*/
+
+#ifndef SAPPHIRE_H
+#define SAPPHIRE_H
#ifndef NULL
#define NULL 0
@@ -80,3 +83,5 @@ unsigned *keypos); public:sapphire (unsigned char
SWORD_NAMESPACE_END
+
+#endif //SAPPHIRE_H
diff --git a/include/zcom.h b/include/zcom.h
index 560b650..9a990d8 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>