[introspection] Fix g-ir-scanner syntax errors

Fixes https://github.com/harfbuzz/harfbuzz/issues/2851
2021-02-10 23:37:43 +02:00 · 2021-02-10 23:37:43 +02:00 · 7b9e23f28b
commit 7b9e23f28b
parent 094406b67b
30 changed files with 31 additions and 44 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -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)
--- a/src/hb-aat-layout.h
+++ b/src/hb-aat-layout.h
@ -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

--- a/src/hb-blob.h
+++ b/src/hb-blob.h
@ -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

--- a/src/hb-buffer.h
+++ b/src/hb-buffer.h
@ -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

--- a/src/hb-common.h
+++ b/src/hb-common.h
@ -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

--- a/src/hb-deprecated.h
+++ b/src/hb-deprecated.h
@ -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

--- a/src/hb-draw.h
+++ b/src/hb-draw.h
@ -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

--- a/src/hb-face.h
+++ b/src/hb-face.h
@ -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

--- a/src/hb-font.h
+++ b/src/hb-font.h
@ -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

--- a/src/hb-gobject-enums.h.tmpl
+++ b/src/hb-gobject-enums.h.tmpl
@ -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

--- a/src/hb-gobject-structs.h
+++ b/src/hb-gobject-structs.h
@ -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

--- a/src/hb-map.h
+++ b/src/hb-map.h
@ -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

--- a/src/hb-ot-color.h
+++ b/src/hb-ot-color.h
@ -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

--- a/src/hb-ot-deprecated.h
+++ b/src/hb-ot-deprecated.h
@ -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

--- a/src/hb-ot-font.h
+++ b/src/hb-ot-font.h
@ -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

--- a/src/hb-ot-layout.h
+++ b/src/hb-ot-layout.h
@ -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

--- a/src/hb-ot-math.h
+++ b/src/hb-ot-math.h
@ -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

--- a/src/hb-ot-meta.h
+++ b/src/hb-ot-meta.h
@ -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

--- a/src/hb-ot-metrics.h
+++ b/src/hb-ot-metrics.h
@ -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

--- a/src/hb-ot-name.h
+++ b/src/hb-ot-name.h
@ -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

--- a/src/hb-ot-shape.h
+++ b/src/hb-ot-shape.h
@ -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

--- a/src/hb-ot-var.h
+++ b/src/hb-ot-var.h
@ -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

--- a/src/hb-set.h
+++ b/src/hb-set.h
@ -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

--- a/src/hb-shape-plan.h
+++ b/src/hb-shape-plan.h
@ -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

--- a/src/hb-shape.h
+++ b/src/hb-shape.h
@ -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

--- a/src/hb-style.h
+++ b/src/hb-style.h
@ -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

--- a/src/hb-unicode.h
+++ b/src/hb-unicode.h
@ -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

--- a/src/hb-version.h
+++ b/src/hb-version.h
@ -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

--- a/src/hb-version.h.in
+++ b/src/hb-version.h.in
@ -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

--- a/src/meson.build
+++ b/src/meson.build
@ -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