walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2853 from harfbuzz/fix-g-ir-scanner 

[introspection] Fix g-ir-scanner syntax errors
This commit is contained in:
Behdad Esfahbod 2021-02-10 14:56:29 -07:00 committed by GitHub
parent 094406b67b 7b9e23f28b
commit 68d576224f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile.am
View File

@ -425,14 +425,7 @@ HarfBuzz_0_0_gir_INCLUDES = GObject-2.0
HarfBuzz_0_0_gir_CFLAGS = \
$(INCLUDES) \
$(HBCFLAGS) \
-DHB_H \
-DHB_H_IN \
-DHB_OT_H \
-DHB_OT_H_IN \
-DHB_AAT_H \
-DHB_AAT_H_IN \
-DHB_GOBJECT_H \
-DHB_GOBJECT_H_IN \
-DHB_NO_SINGLE_HEADER_ERROR \
-DHAVE_GOBJECT \
-DHB_EXTERN= \
$(NULL)

2
src/hb-aat-layout.h
View File

@ -22,7 +22,7 @@
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
#ifndef HB_AAT_H_IN
#if !defined(HB_AAT_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb-aat.h> instead."
#endif

2
src/hb-blob.h
View File

@ -24,7 +24,7 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

2
src/hb-buffer.h
View File

@ -27,7 +27,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

2
src/hb-common.h
View File

@ -26,7 +26,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

2
src/hb-deprecated.h
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

2
src/hb-draw.h
View File

@ -22,7 +22,7 @@
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

2
src/hb-face.h
View File

@ -24,7 +24,7 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

2
src/hb-font.h
View File

@ -24,7 +24,7 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

2
src/hb-gobject-enums.h.tmpl
View File

@ -25,7 +25,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HB_GOBJECT_H_IN
#if !defined(HB_GOBJECT_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb-gobject.h> instead."
#endif

2
src/hb-gobject-structs.h
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HB_GOBJECT_H_IN
#if !defined(HB_GOBJECT_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb-gobject.h> instead."
#endif

2
src/hb-map.h
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

2
src/hb-ot-color.h
View File

@ -26,7 +26,7 @@
* Google Author(s): Sascha Brawer, Behdad Esfahbod
*/
#ifndef HB_OT_H_IN
#if !defined(HB_OT_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb-ot.h> instead."
#endif

2
src/hb-ot-deprecated.h
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HB_OT_H_IN
#if !defined(HB_OT_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb-ot.h> instead."
#endif

2
src/hb-ot-font.h
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod, Roozbeh Pournader
*/
#ifndef HB_OT_H_IN
#if !defined(HB_OT_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb-ot.h> instead."
#endif

2
src/hb-ot-layout.h
View File

@ -24,7 +24,7 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#ifndef HB_OT_H_IN
#if !defined(HB_OT_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb-ot.h> instead."
#endif

2
src/hb-ot-math.h
View File

@ -24,7 +24,7 @@
* Igalia Author(s): Frédéric Wang
*/
#ifndef HB_OT_H_IN
#if !defined(HB_OT_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb-ot.h> instead."
#endif

2
src/hb-ot-meta.h
View File

@ -22,7 +22,7 @@
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
#ifndef HB_OT_H_IN
#if !defined(HB_OT_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb-ot.h> instead."
#endif

2
src/hb-ot-metrics.h
View File

@ -22,7 +22,7 @@
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
#ifndef HB_OT_H_IN
#if !defined(HB_OT_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb-ot.h> instead."
#endif

2
src/hb-ot-name.h
View File

@ -22,7 +22,7 @@
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
#ifndef HB_OT_H_IN
#if !defined(HB_OT_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb-ot.h> instead."
#endif

2
src/hb-ot-shape.h
View File

@ -24,7 +24,7 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#ifndef HB_OT_H_IN
#if !defined(HB_OT_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb-ot.h> instead."
#endif

2
src/hb-ot-var.h
View File

@ -24,7 +24,7 @@
* Red Hat Author(s): Behdad Esfahbod
*/
#ifndef HB_OT_H_IN
#if !defined(HB_OT_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb-ot.h> instead."
#endif

2
src/hb-set.h
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

2
src/hb-shape-plan.h
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

2
src/hb-shape.h
View File

@ -26,7 +26,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

2
src/hb-style.h
View File

@ -22,7 +22,7 @@
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

2
src/hb-unicode.h
View File

@ -28,7 +28,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

2
src/hb-version.h
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

2
src/hb-version.h.in
View File

@ -24,7 +24,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HB_H_IN
#if !defined(HB_H_IN) && !defined(HB_NO_SINGLE_HEADER_ERROR)
#error "Include <hb.h> instead."
#endif

10
src/meson.build
View File

@ -640,14 +640,8 @@ if have_gobject
header: 'hb-gobject.h',
install: true,
extra_args: ['--cflags-begin',
'-DHB_H',
'-DHB_H_IN',
'-DHB_OT_H',
'-DHB_OT_H_IN',
'-DHB_AAT_H',
'-DHB_AAT_H_IN',
'-DHB_GOBJECT_H',
'-DHB_GOBJECT_H_IN',
'-DHB_NO_SINGLE_HEADER_ERROR',
'-DHAVE_GOBJECT',
'-DHB_EXTERN=',
'--cflags-end'])
endif