Clean up file names, add namespace
This commit is contained in:
parent
1f437e6f47
commit
8dd1c8b8d6
|
@ -1,14 +0,0 @@
|
||||||
#ifndef HARFBUZZ_COMMON_H
|
|
||||||
#define HARFBUZZ_COMMON_H
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
# ifdef __cplusplus
|
|
||||||
# define HARFBUZZ_BEGIN_DECLS() extern "C" { extern int harfbuzz_dummy_prototype (int)
|
|
||||||
# define HARFBUZZ_END_DECLS() } extern "C" int harfbuzz_dummy_prototype (int)
|
|
||||||
# else /* !__cplusplus */
|
|
||||||
# define HARFBUZZ_BEGIN_DECLS() extern int harfbuzz_dummy_prototype (int)
|
|
||||||
# define HARFBUZZ_END_DECLS() extern int harfbuzz_dummy_prototype (int)
|
|
||||||
# endif /* !__cplusplus */
|
|
||||||
|
|
||||||
#endif /* HARFBUZZ_COMMON_H */
|
|
|
@ -1,11 +0,0 @@
|
||||||
#ifndef HARFBUZZ_GDEF_H
|
|
||||||
#define HARFBUZZ_GDEF_H
|
|
||||||
|
|
||||||
#include "harfbuzz-common.h"
|
|
||||||
|
|
||||||
HARFBUZZ_BEGIN_DECLS();
|
|
||||||
|
|
||||||
|
|
||||||
HARFBUZZ_END_DECLS();
|
|
||||||
|
|
||||||
#endif /* HARFBUZZ_GDEF_H */
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
#ifndef HB_COMMON_H
|
||||||
|
#define HB_COMMON_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
# ifdef __cplusplus
|
||||||
|
# define HB_BEGIN_DECLS() extern "C" { extern int hb_dummy_prototype (int)
|
||||||
|
# define HB_END_DECLS() } extern "C" int hb_dummy_prototype (int)
|
||||||
|
# else /* !__cplusplus */
|
||||||
|
# define HB_BEGIN_DECLS() extern int hb_dummy_prototype (int)
|
||||||
|
# define HB_END_DECLS() extern int hb_dummy_prototype (int)
|
||||||
|
# endif /* !__cplusplus */
|
||||||
|
|
||||||
|
#endif /* HB_COMMON_H */
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef HARFBUZZ_GDEF_PRIVATE_H
|
#ifndef HB_OT_LAYOUT_GDEF_PRIVATE_H
|
||||||
#define HARFBUZZ_GDEF_PRIVATE_H
|
#define HB_OT_LAYOUT_GDEF_PRIVATE_H
|
||||||
|
|
||||||
#include "harfbuzz-open-private.h"
|
#include "hb-ot-layout-open-private.h"
|
||||||
|
|
||||||
struct GlyphClassDef : ClassDef {
|
struct GlyphClassDef : ClassDef {
|
||||||
static const uint16_t BaseGlyph = 0x0001u;
|
static const uint16_t BaseGlyph = 0x0001u;
|
||||||
|
@ -210,4 +210,4 @@ struct GDEFHeader {
|
||||||
};
|
};
|
||||||
DEFINE_NULL_ASSERT_SIZE (GDEFHeader, 12);
|
DEFINE_NULL_ASSERT_SIZE (GDEFHeader, 12);
|
||||||
|
|
||||||
#endif /* HARFBUZZ_GDEF_PRIVATE_H */
|
#endif /* HB_OT_LAYOUT_GDEF_PRIVATE_H */
|
|
@ -1,8 +1,8 @@
|
||||||
#ifndef HARFBUZZ_OPEN_PRIVATE_H
|
#ifndef HB_OT_LAYOUT_OPEN_PRIVATE_H
|
||||||
#define HARFBUZZ_OPEN_PRIVATE_H
|
#define HB_OT_LAYOUT_OPEN_PRIVATE_H
|
||||||
|
|
||||||
#include "harfbuzz-private.h"
|
#include "hb-private.h"
|
||||||
#include "harfbuzz-open.h"
|
#include "hb-ot-layout.h"
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
|
@ -801,4 +801,4 @@ DEFINE_NULL_ASSERT_SIZE (GSUBGPOSHeader, 10);
|
||||||
DEFINE_NULL_ALIAS (GSUBHeader, GSUBGPOSHeader);
|
DEFINE_NULL_ALIAS (GSUBHeader, GSUBGPOSHeader);
|
||||||
DEFINE_NULL_ALIAS (GPOSHeader, GSUBGPOSHeader);
|
DEFINE_NULL_ALIAS (GPOSHeader, GSUBGPOSHeader);
|
||||||
|
|
||||||
#endif /* HARFBUZZ_OPEN_PRIVATE_H */
|
#endif /* HB_OT_LAYOUT_OPEN_PRIVATE_H */
|
|
@ -1,9 +1,9 @@
|
||||||
#ifndef HARFBUZZ_OPEN_H
|
#ifndef HB_OT_LAYOUT_OPEN_H
|
||||||
#define HARFBUZZ_OPEN_H
|
#define HB_OT_LAYOUT_OPEN_H
|
||||||
|
|
||||||
#include "harfbuzz-common.h"
|
#include "hb-common.h"
|
||||||
|
|
||||||
HARFBUZZ_BEGIN_DECLS();
|
HB_BEGIN_DECLS();
|
||||||
|
|
||||||
typedef uint32_t hb_tag_t;
|
typedef uint32_t hb_tag_t;
|
||||||
#define HB_TAG(a,b,c,d) ((hb_tag_t)(((uint8_t)a<<24)|((uint8_t)b<<16)|((uint8_t)c<<8)|(uint8_t)d))
|
#define HB_TAG(a,b,c,d) ((hb_tag_t)(((uint8_t)a<<24)|((uint8_t)b<<16)|((uint8_t)c<<8)|(uint8_t)d))
|
||||||
|
@ -12,6 +12,6 @@ typedef uint32_t hb_tag_t;
|
||||||
((const char *) s)[2], \
|
((const char *) s)[2], \
|
||||||
((const char *) s)[3]))
|
((const char *) s)[3]))
|
||||||
|
|
||||||
HARFBUZZ_END_DECLS();
|
HB_END_DECLS();
|
||||||
|
|
||||||
#endif /* HARFBUZZ_OPEN_H */
|
#endif /* HB_OT_LAYOUT_OPEN_H */
|
|
@ -1,5 +1,5 @@
|
||||||
#ifndef HARFBUZZ_PRIVATE_H
|
#ifndef HB_PRIVATE_H
|
||||||
#define HARFBUZZ_PRIVATE_H
|
#define HB_PRIVATE_H
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
@ -9,4 +9,4 @@
|
||||||
|
|
||||||
#define ASSERT_SIZE(_type, _size) ASSERT_STATIC (sizeof (_type) == (_size))
|
#define ASSERT_SIZE(_type, _size) ASSERT_STATIC (sizeof (_type) == (_size))
|
||||||
|
|
||||||
#endif /* HARFBUZZ_PRIVATE_H */
|
#endif /* HB_PRIVATE_H */
|
|
@ -1,5 +1,5 @@
|
||||||
#include "harfbuzz-open-private.h"
|
#include "hb-ot-layout-open-private.h"
|
||||||
#include "harfbuzz-gdef-private.h"
|
#include "hb-ot-layout-gdef-private.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
Loading…
Reference in New Issue