diff options
author | Jürg Billeter <j@bitron.ch> | 2019-02-10 05:50:12 +0100 |
---|---|---|
committer | Richard Hughes <richard@hughsie.com> | 2019-02-10 06:45:21 +0000 |
commit | c77a7968137a4385024bf60880f786359f99188a (patch) | |
tree | 44e50a7587c2e01724e233078568fb0814f3f96d | |
parent | 87b7483e79c2dd416fc06d291a784530fa613dbd (diff) | |
download | appstream-glib-c77a7968137a4385024bf60880f786359f99188a.tar.gz |
Fix build of libappstream-glib clients
With '#pragma once', __APPSTREAM_GLIB_H is never defined.
In file included from /usr/include/libappstream-glib/appstream-glib.h:35:
/usr/include/libappstream-glib/as-utils.h:11:2: error: #error "Only <appstream-glib.h> can be included directly."
#error "Only <appstream-glib.h> can be included directly."
^~~~~
Fixes: 87b7483e ("Use '#pragma once' to avoid a lot of boilerplate")
31 files changed, 31 insertions, 31 deletions
diff --git a/libappstream-glib/as-agreement-section.h b/libappstream-glib/as-agreement-section.h index cefc882..f80bdba 100644 --- a/libappstream-glib/as-agreement-section.h +++ b/libappstream-glib/as-agreement-section.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-agreement.h b/libappstream-glib/as-agreement.h index 83a78b1..3ff3f44 100644 --- a/libappstream-glib/as-agreement.h +++ b/libappstream-glib/as-agreement.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-app-builder.h b/libappstream-glib/as-app-builder.h index b8a2545..3fbac28 100644 --- a/libappstream-glib/as-app-builder.h +++ b/libappstream-glib/as-app-builder.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-app.h b/libappstream-glib/as-app.h index 5ede552..ca129b5 100644 --- a/libappstream-glib/as-app.h +++ b/libappstream-glib/as-app.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-bundle.h b/libappstream-glib/as-bundle.h index a8b5bca..c1a2030 100644 --- a/libappstream-glib/as-bundle.h +++ b/libappstream-glib/as-bundle.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-checksum.h b/libappstream-glib/as-checksum.h index 8ffe50b..87d48f0 100644 --- a/libappstream-glib/as-checksum.h +++ b/libappstream-glib/as-checksum.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-content-rating.h b/libappstream-glib/as-content-rating.h index e186e1a..42decd3 100644 --- a/libappstream-glib/as-content-rating.h +++ b/libappstream-glib/as-content-rating.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-enums.h b/libappstream-glib/as-enums.h index 4671551..73fc556 100644 --- a/libappstream-glib/as-enums.h +++ b/libappstream-glib/as-enums.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-format.h b/libappstream-glib/as-format.h index cba782a..847a1ff 100644 --- a/libappstream-glib/as-format.h +++ b/libappstream-glib/as-format.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-icon.h b/libappstream-glib/as-icon.h index 3103c13..0aa863b 100644 --- a/libappstream-glib/as-icon.h +++ b/libappstream-glib/as-icon.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-image.h b/libappstream-glib/as-image.h index 1bbea4c..d2490db 100644 --- a/libappstream-glib/as-image.h +++ b/libappstream-glib/as-image.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-inf.h b/libappstream-glib/as-inf.h index 87e5677..ec6e7a6 100644 --- a/libappstream-glib/as-inf.h +++ b/libappstream-glib/as-inf.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-launchable.h b/libappstream-glib/as-launchable.h index 1f5e8fc..2f549a9 100644 --- a/libappstream-glib/as-launchable.h +++ b/libappstream-glib/as-launchable.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-markup.h b/libappstream-glib/as-markup.h index ee4787f..bc08723 100644 --- a/libappstream-glib/as-markup.h +++ b/libappstream-glib/as-markup.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-monitor.h b/libappstream-glib/as-monitor.h index fc9ea21..ff323ea 100644 --- a/libappstream-glib/as-monitor.h +++ b/libappstream-glib/as-monitor.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-node.h b/libappstream-glib/as-node.h index 0b58ad1..10cf5c8 100644 --- a/libappstream-glib/as-node.h +++ b/libappstream-glib/as-node.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-problem.h b/libappstream-glib/as-problem.h index 4cb198a..8228abd 100644 --- a/libappstream-glib/as-problem.h +++ b/libappstream-glib/as-problem.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-provide.h b/libappstream-glib/as-provide.h index f396931..960a6f4 100644 --- a/libappstream-glib/as-provide.h +++ b/libappstream-glib/as-provide.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-ref-string.h b/libappstream-glib/as-ref-string.h index 397d5e5..4c8d184 100644 --- a/libappstream-glib/as-ref-string.h +++ b/libappstream-glib/as-ref-string.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-release.h b/libappstream-glib/as-release.h index 87e10f3..5050ba9 100644 --- a/libappstream-glib/as-release.h +++ b/libappstream-glib/as-release.h @@ -8,7 +8,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-require.h b/libappstream-glib/as-require.h index 4cbd4bc..fa4bfb7 100644 --- a/libappstream-glib/as-require.h +++ b/libappstream-glib/as-require.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-review.h b/libappstream-glib/as-review.h index 991ca94..b3e2d46 100644 --- a/libappstream-glib/as-review.h +++ b/libappstream-glib/as-review.h @@ -8,7 +8,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-screenshot.h b/libappstream-glib/as-screenshot.h index 61ae9ff..89de18c 100644 --- a/libappstream-glib/as-screenshot.h +++ b/libappstream-glib/as-screenshot.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-store-cab.h b/libappstream-glib/as-store-cab.h index 2059678..ff931b1 100644 --- a/libappstream-glib/as-store-cab.h +++ b/libappstream-glib/as-store-cab.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-store.h b/libappstream-glib/as-store.h index 1eb1acf..e775c71 100644 --- a/libappstream-glib/as-store.h +++ b/libappstream-glib/as-store.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-suggest.h b/libappstream-glib/as-suggest.h index 946f23f..5cdb65c 100644 --- a/libappstream-glib/as-suggest.h +++ b/libappstream-glib/as-suggest.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-tag.h b/libappstream-glib/as-tag.h index 16b8cf2..af84c19 100644 --- a/libappstream-glib/as-tag.h +++ b/libappstream-glib/as-tag.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-translation.h b/libappstream-glib/as-translation.h index 4fb5c80..ee8c4a1 100644 --- a/libappstream-glib/as-translation.h +++ b/libappstream-glib/as-translation.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-utils.h b/libappstream-glib/as-utils.h index 732d33f..95343dc 100644 --- a/libappstream-glib/as-utils.h +++ b/libappstream-glib/as-utils.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-version.h.in b/libappstream-glib/as-version.h.in index f1e2d8e..277a1cf 100644 --- a/libappstream-glib/as-version.h.in +++ b/libappstream-glib/as-version.h.in @@ -17,7 +17,7 @@ * depending on the version of libappstream-glib headers installed. */ -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream_glib.h> can be included directly." #endif diff --git a/libappstream-glib/as-yaml.h b/libappstream-glib/as-yaml.h index b6a1886..ce8e49d 100644 --- a/libappstream-glib/as-yaml.h +++ b/libappstream-glib/as-yaml.h @@ -7,7 +7,7 @@ #pragma once -#if !defined (__APPSTREAM_GLIB_H) && !defined (AS_COMPILATION) +#if !defined (__APPSTREAM_GLIB_H_INSIDE__) && !defined (AS_COMPILATION) #error "Only <appstream-glib.h> can be included directly." #endif |