- updated all source files to adhere to the new inclusion scheme
- the CFF loader now loads the encodings and charset tables
though doesn't use them for now
diff --git a/src/truetype/ttpload.h b/src/truetype/ttpload.h
index 7d8b8d9..7ee4f8c 100644
--- a/src/truetype/ttpload.h
+++ b/src/truetype/ttpload.h
@@ -19,13 +19,10 @@
#ifndef TTPLOAD_H
#define TTPLOAD_H
-#include <freetype/internal/tttypes.h>
+#include <ft2build.h>
+#include FT_INTERNAL_TRUETYPE_TYPES_H
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
+FT_BEGIN_HEADER
FT_LOCAL
FT_Error TT_Load_Locations( TT_Face face,
@@ -39,11 +36,7 @@
FT_Error TT_Load_Programs( TT_Face face,
FT_Stream stream );
-
-#ifdef __cplusplus
- }
-#endif
-
+FT_END_HEADER
#endif /* TTPLOAD_H */