summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/freetype/src/bdf/bdf.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/freetype/src/bdf/bdf.h')
-rw-r--r--src/3rdparty/freetype/src/bdf/bdf.h27
1 files changed, 5 insertions, 22 deletions
diff --git a/src/3rdparty/freetype/src/bdf/bdf.h b/src/3rdparty/freetype/src/bdf/bdf.h
index f24d925d8f..9012727c7e 100644
--- a/src/3rdparty/freetype/src/bdf/bdf.h
+++ b/src/3rdparty/freetype/src/bdf/bdf.h
@@ -22,8 +22,8 @@
*/
-#ifndef __BDF_H__
-#define __BDF_H__
+#ifndef BDF_H_
+#define BDF_H_
/*
@@ -33,6 +33,7 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_STREAM_H
+#include FT_INTERNAL_HASH_H
FT_BEGIN_HEADER
@@ -157,24 +158,6 @@ FT_BEGIN_HEADER
} bdf_glyph_t;
- typedef struct _hashnode_
- {
- const char* key;
- size_t data;
-
- } _hashnode, *hashnode;
-
-
- typedef struct hashtable_
- {
- unsigned int limit;
- unsigned int size;
- unsigned int used;
- hashnode* table;
-
- } hashtable;
-
-
typedef struct bdf_glyphlist_t_
{
unsigned short pad; /* Pad to 4-byte boundary. */
@@ -238,7 +221,7 @@ FT_BEGIN_HEADER
bdf_property_t* user_props;
unsigned long nuser_props;
- hashtable proptbl;
+ FT_HashRec proptbl;
} bdf_font_t;
@@ -291,7 +274,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* __BDF_H__ */
+#endif /* BDF_H_ */
/* END */