girepository: Use subdir paths in #includes

The pkg-config file sets the include directory to the level above `girepository/`, just like with GIO, GObject and GModule. Signed-off-by: Philip Withnall <philip@tecnocode.co.uk> Helps: #3155
2025-02-04 10:16:17 +01:00 · 2023-10-25 17:45:42 +01:00 · 2023-10-25 17:45:42 +01:00 · a27a75b219
commit a27a75b219
parent 4dcd044b02
33 changed files with 36 additions and 36 deletions
--- a/girepository/giarginfo.h
+++ b/girepository/giarginfo.h
@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif

-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/gibaseinfo.h
+++ b/girepository/gibaseinfo.h
@ -30,8 +30,8 @@
 #endif

 #include <glib-object.h>
-#include <gitypelib.h>
-#include <gitypes.h>
+#include <girepository/gitypelib.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/gicallableinfo.c
+++ b/girepository/gicallableinfo.c
@ -28,7 +28,7 @@

 #include <glib.h>

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 #include "girffi.h"
--- a/girepository/gicallableinfo.h
+++ b/girepository/gicallableinfo.h
@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif

-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/giconstantinfo.c
+++ b/girepository/giconstantinfo.c
@ -27,7 +27,7 @@
 #include <glib.h>
 #include <string.h> // memcpy

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"

--- a/girepository/giconstantinfo.h
+++ b/girepository/giconstantinfo.h
@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif

-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/gienuminfo.c
+++ b/girepository/gienuminfo.c
@ -26,7 +26,7 @@

 #include <glib.h>

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"

--- a/girepository/gienuminfo.h
+++ b/girepository/gienuminfo.h
@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif

-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/gifieldinfo.c
+++ b/girepository/gifieldinfo.c
@ -26,7 +26,7 @@

 #include <glib.h>

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 #include "config.h"
--- a/girepository/gifieldinfo.h
+++ b/girepository/gifieldinfo.h
@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif

-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/gifunctioninfo.c
+++ b/girepository/gifunctioninfo.c
@ -28,7 +28,7 @@

 #include <glib.h>

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"

--- a/girepository/gifunctioninfo.h
+++ b/girepository/gifunctioninfo.h
@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif

-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/giinterfaceinfo.c
+++ b/girepository/giinterfaceinfo.c
@ -26,7 +26,7 @@

 #include <glib.h>

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"

--- a/girepository/giinterfaceinfo.h
+++ b/girepository/giinterfaceinfo.h
@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif

-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/ginvoke.c
+++ b/girepository/ginvoke.c
@ -28,7 +28,7 @@
 #include <glib.h>
 #include <glib-object.h>

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girffi.h"

 /**
--- a/girepository/giobjectinfo.c
+++ b/girepository/giobjectinfo.c
@ -26,7 +26,7 @@

 #include <glib.h>

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"

--- a/girepository/giobjectinfo.h
+++ b/girepository/giobjectinfo.h
@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif

-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/gipropertyinfo.c
+++ b/girepository/gipropertyinfo.c
@ -26,7 +26,7 @@

 #include <glib.h>

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"

--- a/girepository/gipropertyinfo.h
+++ b/girepository/gipropertyinfo.h
@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif

-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/giregisteredtypeinfo.c
+++ b/girepository/giregisteredtypeinfo.c
@ -28,7 +28,7 @@

 #include <glib.h>

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"

--- a/girepository/giregisteredtypeinfo.h
+++ b/girepository/giregisteredtypeinfo.h
@ -30,7 +30,7 @@
 #endif

 #include <glib-object.h>
-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/girepository-private.h
+++ b/girepository/girepository-private.h
@ -29,9 +29,9 @@

 #define __GIREPOSITORY_H_INSIDE__

-#include <gibaseinfo.h>
-#include <girepository.h>
-#include <gitypelib.h>
+#include <girepository/gibaseinfo.h>
+#include <girepository/girepository.h>
+#include <girepository/gitypelib.h>

 typedef struct _GIRealInfo GIRealInfo;

--- a/girepository/gisignalinfo.c
+++ b/girepository/gisignalinfo.c
@ -26,7 +26,7 @@

 #include <glib.h>

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"

--- a/girepository/gisignalinfo.h
+++ b/girepository/gisignalinfo.h
@ -30,7 +30,7 @@
 #endif

 #include <glib-object.h>
-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/gistructinfo.c
+++ b/girepository/gistructinfo.c
@ -28,7 +28,7 @@

 #include <glib.h>

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"

--- a/girepository/gistructinfo.h
+++ b/girepository/gistructinfo.h
@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif

-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/gitypeinfo.c
+++ b/girepository/gitypeinfo.c
@ -26,7 +26,7 @@

 #include <glib.h>

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"

--- a/girepository/gitypeinfo.h
+++ b/girepository/gitypeinfo.h
@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif

-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/gitypelib.h
+++ b/girepository/gitypelib.h
@ -31,7 +31,7 @@

 #include <glib.h>

-#include <gi-visibility.h>
+#include <girepository/gi-visibility.h>

 G_BEGIN_DECLS

--- a/girepository/giunioninfo.c
+++ b/girepository/giunioninfo.c
@ -26,7 +26,7 @@

 #include <glib.h>

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"

--- a/girepository/giunioninfo.h
+++ b/girepository/giunioninfo.h
@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif

-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS

--- a/girepository/givfuncinfo.c
+++ b/girepository/givfuncinfo.c
@ -28,7 +28,7 @@

 #include <glib.h>

-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"

--- a/girepository/givfuncinfo.h
+++ b/girepository/givfuncinfo.h
@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif

-#include <gitypes.h>
+#include <girepository/gitypes.h>

 G_BEGIN_DECLS