fixed some header files inclusions added C++ stubs to public header files
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
diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h
index 853dc25..44d9ae2 100644
--- a/include/freetype/ftglyph.h
+++ b/include/freetype/ftglyph.h
@@ -28,6 +28,10 @@
#include <freetype/freetype.h>
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
typedef enum {
ft_glyph_type_none = 0,
@@ -312,4 +316,8 @@
EXPORT_DEF(void) FT_Glyph_Get_Box( FT_Glyph glyph,
FT_BBox *box );
+#ifdef __cplusplus
+ }
+#endif
+
#endif /* FTGLYPH_H */
diff --git a/include/freetype/tttables.h b/include/freetype/tttables.h
index 6bbe870..ac6a951 100644
--- a/include/freetype/tttables.h
+++ b/include/freetype/tttables.h
@@ -21,6 +21,10 @@
#include <freetype/freetype.h>
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
/*************************************************************************/
/* */
/* <Struct> */
@@ -557,6 +561,10 @@
EXPORT_DEF(void*) FT_Get_Sfnt_Table( FT_Face face,
FT_Sfnt_Tag tag );
+#ifdef __cplusplus
+ }
+#endif
+
#endif /* TTTABLES_H */
diff --git a/src/sfnt/sfdriver.h b/src/sfnt/sfdriver.h
index a29a81c..24a2646 100644
--- a/src/sfnt/sfdriver.h
+++ b/src/sfnt/sfdriver.h
@@ -20,6 +20,7 @@
#define SFDRIVER_H
#include <freetype/internal/ftdriver.h>
+#include <freetype/internal/ftobjs.h>
EXPORT_VAR(const FT_DriverInterface) sfnt_driver_interface;