diff --git a/libfwupd/fwupd-client.h b/libfwupd/fwupd-client.h index 29bc13d54..0fe590933 100644 --- a/libfwupd/fwupd-client.h +++ b/libfwupd/fwupd-client.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FWUPD_CLIENT_H -#define __FWUPD_CLIENT_H +#pragma once #include #include @@ -129,6 +128,3 @@ FwupdRemote *fwupd_client_get_remote_by_id (FwupdClient *client, GError **error); G_END_DECLS - -#endif /* __FWUPD_CLIENT_H */ - diff --git a/libfwupd/fwupd-common-private.h b/libfwupd/fwupd-common-private.h index 15c361312..b5f9c4997 100644 --- a/libfwupd/fwupd-common-private.h +++ b/libfwupd/fwupd-common-private.h @@ -4,13 +4,10 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FWUPD_COMMON_PRIVATE_H -#define __FWUPD_COMMON_PRIVATE_H +#pragma once #include #include "fwupd-common.h" gchar *fwupd_checksum_format_for_display (const gchar *checksum); - -#endif /* __FWUPD_COMMON_PRIVATE_H */ diff --git a/libfwupd/fwupd-common.h b/libfwupd/fwupd-common.h index d563ffac2..155ea4b3e 100644 --- a/libfwupd/fwupd-common.h +++ b/libfwupd/fwupd-common.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FWUPD_COMMON_H -#define __FWUPD_COMMON_H +#pragma once #include @@ -68,5 +67,3 @@ gchar *fwupd_guid_hash_string (const gchar *str); gchar *fwupd_guid_hash_data (const guint8 *data, gsize datasz, FwupdGuidFlags flags); - -#endif /* __FWUPD_COMMON_H */ diff --git a/libfwupd/fwupd-deprecated.h b/libfwupd/fwupd-deprecated.h index dead6a362..7c0d71b41 100644 --- a/libfwupd/fwupd-deprecated.h +++ b/libfwupd/fwupd-deprecated.h @@ -4,9 +4,6 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FWUPD_DEPRECATED_H -#define __FWUPD_DEPRECATED_H +#pragma once /* indeed, nothing */ - -#endif /* __FWUPD_DEPRECATED_H */ diff --git a/libfwupd/fwupd-device-private.h b/libfwupd/fwupd-device-private.h index efc490dfd..57ee56dad 100644 --- a/libfwupd/fwupd-device-private.h +++ b/libfwupd/fwupd-device-private.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FWUPD_DEVICE_PRIVATE_H -#define __FWUPD_DEVICE_PRIVATE_H +#pragma once #include @@ -22,5 +21,3 @@ void fwupd_device_incorporate (FwupdDevice *self, G_END_DECLS -#endif /* __FWUPD_DEVICE_PRIVATE_H */ - diff --git a/libfwupd/fwupd-device.h b/libfwupd/fwupd-device.h index 61018c4ec..4de28d085 100644 --- a/libfwupd/fwupd-device.h +++ b/libfwupd/fwupd-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FWUPD_DEVICE_H -#define __FWUPD_DEVICE_H +#pragma once #include @@ -128,6 +127,3 @@ gint fwupd_device_compare (FwupdDevice *device1, FwupdDevice *device2); G_END_DECLS - -#endif /* __FWUPD_DEVICE_H */ - diff --git a/libfwupd/fwupd-enums-private.h b/libfwupd/fwupd-enums-private.h index 6832886ac..b4e9019f0 100644 --- a/libfwupd/fwupd-enums-private.h +++ b/libfwupd/fwupd-enums-private.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FWUPD_ENUMS_PRIVATE_H -#define __FWUPD_ENUMS_PRIVATE_H +#pragma once #define FWUPD_RESULT_KEY_APPSTREAM_ID "AppstreamId" /* s */ #define FWUPD_RESULT_KEY_CHECKSUM "Checksum" /* as */ @@ -45,5 +44,3 @@ #define FWUPD_RESULT_KEY_VERSION_BOOTLOADER "VersionBootloader" /* s */ #define FWUPD_RESULT_KEY_VERSION_LOWEST "VersionLowest" /* s */ #define FWUPD_RESULT_KEY_VERSION "Version" /* s */ - -#endif /* __FWUPD_ENUMS_PRIVATE_H */ diff --git a/libfwupd/fwupd-enums.h b/libfwupd/fwupd-enums.h index 042a40cc1..55a7e345f 100644 --- a/libfwupd/fwupd-enums.h +++ b/libfwupd/fwupd-enums.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FWUPD_ENUMS_H -#define __FWUPD_ENUMS_H +#pragma once #include @@ -183,5 +182,3 @@ const gchar *fwupd_trust_flag_to_string (FwupdTrustFlags trust_flag); FwupdTrustFlags fwupd_trust_flag_from_string (const gchar *trust_flag); FwupdKeyringKind fwupd_keyring_kind_from_string (const gchar *keyring_kind); const gchar *fwupd_keyring_kind_to_string (FwupdKeyringKind keyring_kind); - -#endif /* __FWUPD_ENUMS_H */ diff --git a/libfwupd/fwupd-error.h b/libfwupd/fwupd-error.h index 7e8fea586..e5887942a 100644 --- a/libfwupd/fwupd-error.h +++ b/libfwupd/fwupd-error.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FWUPD_ERROR_H -#define __FWUPD_ERROR_H +#pragma once #include @@ -52,5 +51,3 @@ typedef enum { GQuark fwupd_error_quark (void); const gchar *fwupd_error_to_string (FwupdError error); FwupdError fwupd_error_from_string (const gchar *error); - -#endif /* __FWUPD_ERROR_H */ diff --git a/libfwupd/fwupd-release-private.h b/libfwupd/fwupd-release-private.h index 0cfc6252d..f889e2b4c 100644 --- a/libfwupd/fwupd-release-private.h +++ b/libfwupd/fwupd-release-private.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FWUPD_RELEASE_PRIVATE_H -#define __FWUPD_RELEASE_PRIVATE_H +#pragma once #include @@ -18,5 +17,3 @@ GVariant *fwupd_release_to_variant (FwupdRelease *release); G_END_DECLS -#endif /* __FWUPD_RELEASE_PRIVATE_H */ - diff --git a/libfwupd/fwupd-release.h b/libfwupd/fwupd-release.h index 4b0d9493c..c797db8f3 100644 --- a/libfwupd/fwupd-release.h +++ b/libfwupd/fwupd-release.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FWUPD_RELEASE_H -#define __FWUPD_RELEASE_H +#pragma once #include @@ -101,6 +100,3 @@ void fwupd_release_set_update_message (FwupdRelease *release, const gchar *update_message); G_END_DECLS - -#endif /* __FWUPD_RELEASE_H */ - diff --git a/libfwupd/fwupd-remote-private.h b/libfwupd/fwupd-remote-private.h index defbab0fa..acf5b42d3 100644 --- a/libfwupd/fwupd-remote-private.h +++ b/libfwupd/fwupd-remote-private.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FWUPD_REMOTE_PRIVATE_H -#define __FWUPD_REMOTE_PRIVATE_H +#pragma once #include "fwupd-remote.h" @@ -27,6 +26,3 @@ gchar **fwupd_remote_get_order_after (FwupdRemote *self); gchar **fwupd_remote_get_order_before (FwupdRemote *self); G_END_DECLS - -#endif /* __FWUPD_REMOTE_PRIVATE_H */ - diff --git a/libfwupd/fwupd-remote.h b/libfwupd/fwupd-remote.h index 144d0c2a7..b0b62cebc 100644 --- a/libfwupd/fwupd-remote.h +++ b/libfwupd/fwupd-remote.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FWUPD_REMOTE_H -#define __FWUPD_REMOTE_H +#pragma once #include "fwupd-enums.h" @@ -71,6 +70,3 @@ gchar *fwupd_remote_build_firmware_uri (FwupdRemote *self, GError **error); G_END_DECLS - -#endif /* __FWUPD_REMOTE_H */ - diff --git a/libfwupd/fwupd-version.h.in b/libfwupd/fwupd-version.h.in index 0afedb3e6..6ef308f68 100644 --- a/libfwupd/fwupd-version.h.in +++ b/libfwupd/fwupd-version.h.in @@ -3,6 +3,9 @@ * * SPDX-License-Identifier: LGPL-2.1+ */ + +#pragma once + /** * SECTION:fwupd-version * @short_description: Obtains the version for the installed fwupd @@ -15,9 +18,6 @@ #error "Only can be included directly." #endif -#ifndef __FWUPD_VERSION_H -#define __FWUPD_VERSION_H - /** * FWUPD_MAJOR_VERSION: * @@ -59,5 +59,3 @@ (FWUPD_MAJOR_VERSION == (major) && FWUPD_MINOR_VERSION > (minor)) || \ (FWUPD_MAJOR_VERSION == (major) && FWUPD_MINOR_VERSION == (minor) && \ FWUPD_MICRO_VERSION >= (micro))) - -#endif /* __FWUPD_VERSION_H */ diff --git a/libfwupd/fwupd.h b/libfwupd/fwupd.h index 06f46aa93..82571aa26 100644 --- a/libfwupd/fwupd.h +++ b/libfwupd/fwupd.h @@ -4,14 +4,13 @@ * SPDX-License-Identifier: LGPL-2.1+ */ +#pragma once + /** * SECTION:fwupd * @short_description: Helper objects for accessing fwupd */ -#ifndef __FWUPD_H__ -#define __FWUPD_H__ - #define __FWUPD_H_INSIDE__ #include @@ -28,6 +27,3 @@ #endif #undef __FWUPD_H_INSIDE__ - -#endif /* __FWUPD_H__ */ - diff --git a/plugins/altos/fu-altos-device.h b/plugins/altos/fu-altos-device.h index 3c2d35acb..6eebb0a69 100644 --- a/plugins/altos/fu-altos-device.h +++ b/plugins/altos/fu-altos-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_ALTOS_DEVICE_H -#define __FU_ALTOS_DEVICE_H +#pragma once #include "fu-plugin.h" @@ -35,5 +34,3 @@ const gchar *fu_altos_device_kind_to_string (FuAltosDeviceKind kind); FuAltosDeviceKind fu_altos_device_get_kind (FuAltosDevice *device); G_END_DECLS - -#endif /* __FU_ALTOS_DEVICE_H */ diff --git a/plugins/altos/fu-altos-firmware.h b/plugins/altos/fu-altos-firmware.h index c956cb675..9051161ef 100644 --- a/plugins/altos/fu-altos-firmware.h +++ b/plugins/altos/fu-altos-firmware.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_ALTOS_FIRMWARE_H -#define __FU_ALTOS_FIRMWARE_H +#pragma once G_BEGIN_DECLS @@ -21,5 +20,3 @@ gboolean fu_altos_firmware_parse (FuAltosFirmware *self, GError **error); G_END_DECLS - -#endif /* __FU_ALTOS_FIRMWARE_H */ diff --git a/plugins/ata/fu-ata-device.h b/plugins/ata/fu-ata-device.h index ce0619aa4..0fed96bc4 100644 --- a/plugins/ata/fu-ata-device.h +++ b/plugins/ata/fu-ata-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_ATA_DEVICE_H -#define __FU_ATA_DEVICE_H +#pragma once #include "fu-plugin.h" @@ -24,5 +23,3 @@ guint8 fu_ata_device_get_transfer_mode (FuAtaDevice *self); guint16 fu_ata_device_get_transfer_blocks (FuAtaDevice *self); G_END_DECLS - -#endif /* __FU_ATA_DEVICE_H */ diff --git a/plugins/colorhug/fu-colorhug-common.h b/plugins/colorhug/fu-colorhug-common.h index e0b2fb9e4..5e65c05e8 100644 --- a/plugins/colorhug/fu-colorhug-common.h +++ b/plugins/colorhug/fu-colorhug-common.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_COLORHUG_COMMON_H -#define __FU_COLORHUG_COMMON_H +#pragma once #include @@ -54,5 +53,3 @@ typedef enum { const gchar *ch_strerror (ChError error_enum); G_END_DECLS - -#endif /* __FU_COLORHUG_COMMON_H */ diff --git a/plugins/colorhug/fu-colorhug-device.h b/plugins/colorhug/fu-colorhug-device.h index d76999906..07ec18bf9 100644 --- a/plugins/colorhug/fu-colorhug-device.h +++ b/plugins/colorhug/fu-colorhug-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_COLORHUG_DEVICE_H -#define __FU_COLORHUG_DEVICE_H +#pragma once #include "fu-plugin.h" @@ -22,5 +21,3 @@ gboolean fu_colorhug_device_set_flash_success (FuColorhugDevice *device, GError **error); G_END_DECLS - -#endif /* __FU_COLORHUG_DEVICE_H */ diff --git a/plugins/csr/fu-csr-device.h b/plugins/csr/fu-csr-device.h index 14053c804..f376bb3f4 100644 --- a/plugins/csr/fu-csr-device.h +++ b/plugins/csr/fu-csr-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_CSR_DEVICE_H -#define __FU_CSR_DEVICE_H +#pragma once #include "fu-plugin.h" @@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuCsrDevice, fu_csr_device, FU, CSR_DEVICE, FuUsbDevice) FuCsrDevice *fu_csr_device_new (FuUsbDevice *device); G_END_DECLS - -#endif /* __FU_CSR_DEVICE_H */ diff --git a/plugins/dell-dock/fu-dell-dock-common.h b/plugins/dell-dock/fu-dell-dock-common.h index d411ae2d1..16db8812d 100644 --- a/plugins/dell-dock/fu-dell-dock-common.h +++ b/plugins/dell-dock/fu-dell-dock-common.h @@ -13,8 +13,7 @@ * SPDX-License-Identifier: LGPL-2.1+ OR MIT */ -#ifndef __FU_DELL_DOCK_COMMON_H -#define __FU_DELL_DOCK_COMMON_H +#pragma once #include "config.h" @@ -36,5 +35,3 @@ gboolean fu_dell_dock_set_power (FuDevice *device, void fu_dell_dock_will_replug (FuDevice *device); void fu_dell_dock_clone_updatable (FuDevice *device); - -#endif /* __FU_DELL_DOCK_COMMON_H */ diff --git a/plugins/dell-dock/fu-dell-dock-hid.h b/plugins/dell-dock/fu-dell-dock-hid.h index f69936820..613151283 100644 --- a/plugins/dell-dock/fu-dell-dock-hid.h +++ b/plugins/dell-dock/fu-dell-dock-hid.h @@ -14,8 +14,7 @@ * SPDX-License-Identifier: LGPL-2.1+ OR MIT */ -#ifndef __FU_DELL_DOCK_HID_H -#define __FU_DELL_DOCK_HID_H +#pragma once #include "config.h" @@ -92,5 +91,3 @@ gboolean fu_dell_dock_hid_tbt_write (FuDevice *self, gboolean fu_dell_dock_hid_tbt_authenticate (FuDevice *self, const FuHIDI2CParameters *parameters, GError **error); - -#endif /* __FU_DELL_DOCK_HID_H */ diff --git a/plugins/dell-dock/fu-dell-dock-hub.h b/plugins/dell-dock/fu-dell-dock-hub.h index a002672c3..916cf7269 100644 --- a/plugins/dell-dock/fu-dell-dock-hub.h +++ b/plugins/dell-dock/fu-dell-dock-hub.h @@ -13,8 +13,7 @@ * SPDX-License-Identifier: LGPL-2.1+ OR MIT */ -#ifndef __FU_DELL_DOCK_HUB_H -#define __FU_DELL_DOCK_HUB_H +#pragma once #include "config.h" @@ -28,5 +27,3 @@ G_DECLARE_FINAL_TYPE (FuDellDockHub, fu_dell_dock_hub, FU, DELL_DOCK_HUB, FuUsbD FuDellDockHub *fu_dell_dock_hub_new (FuUsbDevice *device); G_END_DECLS - -#endif /* __FU_DELL_DOCK_HUB_H */ diff --git a/plugins/dell-dock/fu-dell-dock-i2c-ec.h b/plugins/dell-dock/fu-dell-dock-i2c-ec.h index db597c3ff..4cedeb1ac 100644 --- a/plugins/dell-dock/fu-dell-dock-i2c-ec.h +++ b/plugins/dell-dock/fu-dell-dock-i2c-ec.h @@ -13,8 +13,7 @@ * SPDX-License-Identifier: LGPL-2.1+ OR MIT */ -#ifndef __FU_DELL_DOCK_EC_H -#define __FU_DELL_DOCK_EC_H +#pragma once #include "config.h" @@ -48,5 +47,3 @@ gboolean fu_dell_dock_ec_commit_package (FuDevice *device, GBytes *blob_fw, GError **error); FuDevice *fu_dell_dock_ec_get_symbiote (FuDevice *device); - -#endif /* __FU_DELL_DOCK_EC_H */ diff --git a/plugins/dell-dock/fu-dell-dock-i2c-mst.h b/plugins/dell-dock/fu-dell-dock-i2c-mst.h index 18ada5b52..806ecbd99 100644 --- a/plugins/dell-dock/fu-dell-dock-i2c-mst.h +++ b/plugins/dell-dock/fu-dell-dock-i2c-mst.h @@ -13,8 +13,7 @@ * SPDX-License-Identifier: LGPL-2.1+ OR MIT */ -#ifndef __FU_DELL_DOCK_I2C_MST_H -#define __FU_DELL_DOCK_I2C_MST_H +#pragma once #include "config.h" @@ -28,5 +27,3 @@ G_DECLARE_FINAL_TYPE (FuDellDockMst, fu_dell_dock_mst, FU, DELL_DOCK_MST, FuDevi FuDellDockMst *fu_dell_dock_mst_new (void); G_END_DECLS - -#endif /* __FU_DELL_DOCK_I2C_MST_H */ diff --git a/plugins/dell-dock/fu-dell-dock-i2c-tbt.h b/plugins/dell-dock/fu-dell-dock-i2c-tbt.h index 62f91c0bd..2dfcd758a 100644 --- a/plugins/dell-dock/fu-dell-dock-i2c-tbt.h +++ b/plugins/dell-dock/fu-dell-dock-i2c-tbt.h @@ -14,8 +14,7 @@ * SPDX-License-Identifier: LGPL-2.1+ OR MIT */ -#ifndef __FU_DELLDOCK_I2C_TBT_H -#define __FU_DELLDOCK_I2C_TBT_H +#pragma once #include "config.h" @@ -29,6 +28,3 @@ G_DECLARE_FINAL_TYPE (FuDellDockTbt, fu_dell_dock_tbt, FU, DELL_DOCK_TBT, FuDevi FuDellDockTbt *fu_dell_dock_tbt_new (void); G_END_DECLS - - -#endif /* __FU_DELLDOCK_I2C_TBT_H */ diff --git a/plugins/dell-dock/fu-dell-dock-status.h b/plugins/dell-dock/fu-dell-dock-status.h index f987a325d..c5f207c2f 100644 --- a/plugins/dell-dock/fu-dell-dock-status.h +++ b/plugins/dell-dock/fu-dell-dock-status.h @@ -13,8 +13,7 @@ * SPDX-License-Identifier: LGPL-2.1+ OR MIT */ -#ifndef __FU_DELL_DOCK_STATUS_H -#define __FU_DELL_DOCK_STATUS_H +#pragma once #include "config.h" @@ -28,5 +27,3 @@ G_DECLARE_FINAL_TYPE (FuDellDockStatus, fu_dell_dock_status, FU, DELL_DOCK_STATU FuDellDockStatus *fu_dell_dock_status_new (void); G_END_DECLS - -#endif /* __FU_DELL_DOCK_STATUS_H */ diff --git a/plugins/dell/fu-dell-smi.h b/plugins/dell/fu-dell-smi.h index e96c437e7..a5d0cf892 100644 --- a/plugins/dell/fu-dell-smi.h +++ b/plugins/dell/fu-dell-smi.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_DELL_COMMON_H -#define __FU_DELL_COMMON_H +#pragma once #include "fu-device.h" #include @@ -126,5 +125,3 @@ fu_dell_toggle_host_mode (FuDellSmiObj *smi_obj, const efi_guid_t guid, int mode /* VID/PID of ethernet controller on dock */ #define DOCK_NIC_VID 0x0bda #define DOCK_NIC_PID 0x8153 - -#endif /* __FU_DELL_COMMON_H */ diff --git a/plugins/dell/fu-plugin-dell.h b/plugins/dell/fu-plugin-dell.h index c0aacd3d1..311cd9893 100644 --- a/plugins/dell/fu-plugin-dell.h +++ b/plugins/dell/fu-plugin-dell.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_PLUGIN_DELL_H -#define __FU_PLUGIN_DELL_H +#pragma once #include "fu-plugin.h" #include "fu-dell-smi.h" @@ -40,5 +39,3 @@ struct tpm_status { #define TPM_TYPE_MASK 0x0F00 #define TPM_1_2_MODE 0x0001 #define TPM_2_0_MODE 0x0002 - -#endif /* __FU_PLUGIN_DELL_H */ diff --git a/plugins/dfu/dfu-cipher-xtea.h b/plugins/dfu/dfu-cipher-xtea.h index 3f8164957..828e37578 100644 --- a/plugins/dfu/dfu-cipher-xtea.h +++ b/plugins/dfu/dfu-cipher-xtea.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_FORMAT_XTEA_H -#define __DFU_FORMAT_XTEA_H +#pragma once #include #include @@ -22,5 +21,3 @@ gboolean dfu_cipher_decrypt_xtea (const gchar *key, GError **error); G_END_DECLS - -#endif /* __DFU_FORMAT_XTEA_H */ diff --git a/plugins/dfu/dfu-common.h b/plugins/dfu/dfu-common.h index 09c54a97c..4d16c66db 100644 --- a/plugins/dfu/dfu-common.h +++ b/plugins/dfu/dfu-common.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_COMMON_H -#define __DFU_COMMON_H +#pragma once #include #include @@ -171,5 +170,3 @@ gchar **dfu_utils_strnsplit (const gchar *str, gint max_tokens); G_END_DECLS - -#endif /* __DFU_COMMON_H */ diff --git a/plugins/dfu/dfu-device-private.h b/plugins/dfu/dfu-device-private.h index 9cc53dd0d..3c257a258 100644 --- a/plugins/dfu/dfu-device-private.h +++ b/plugins/dfu/dfu-device-private.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_DEVICE_PRIVATE_H -#define __DFU_DEVICE_PRIVATE_H +#pragma once #include #include @@ -26,5 +25,3 @@ gboolean dfu_device_ensure_interface (DfuDevice *device, GError **error); G_END_DECLS - -#endif /* __DFU_DEVICE_PRIVATE_H */ diff --git a/plugins/dfu/dfu-device.h b/plugins/dfu/dfu-device.h index 900a24001..b9cc375d4 100644 --- a/plugins/dfu/dfu-device.h +++ b/plugins/dfu/dfu-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_DEVICE_H -#define __DFU_DEVICE_H +#pragma once #include #include @@ -162,5 +161,3 @@ void dfu_device_set_usb_context (DfuDevice *device, GUsbContext *dfu_device_get_usb_context (DfuDevice *device); G_END_DECLS - -#endif /* __DFU_DEVICE_H */ diff --git a/plugins/dfu/dfu-element.h b/plugins/dfu/dfu-element.h index 49a4178c4..b6a60a1d0 100644 --- a/plugins/dfu/dfu-element.h +++ b/plugins/dfu/dfu-element.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_ELEMENT_H -#define __DFU_ELEMENT_H +#pragma once #include #include @@ -41,5 +40,3 @@ void dfu_element_set_padding_value (DfuElement *element, gchar *dfu_element_to_string (DfuElement *element); G_END_DECLS - -#endif /* __DFU_ELEMENT_H */ diff --git a/plugins/dfu/dfu-firmware.h b/plugins/dfu/dfu-firmware.h index 306aa0ebb..d43fe7db8 100644 --- a/plugins/dfu/dfu-firmware.h +++ b/plugins/dfu/dfu-firmware.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_FIRMWARE_H -#define __DFU_FIRMWARE_H +#pragma once #include #include @@ -120,5 +119,3 @@ void dfu_firmware_remove_metadata (DfuFirmware *firmware, const gchar *key); G_END_DECLS - -#endif /* __DFU_FIRMWARE_H */ diff --git a/plugins/dfu/dfu-format-dfu.h b/plugins/dfu/dfu-format-dfu.h index 5bef25e7d..dae1c5798 100644 --- a/plugins/dfu/dfu-format-dfu.h +++ b/plugins/dfu/dfu-format-dfu.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_FORMAT_DFU_H -#define __DFU_FORMAT_DFU_H +#pragma once #include #include @@ -23,5 +22,3 @@ gboolean dfu_firmware_from_dfu (DfuFirmware *firmware, GError **error); G_END_DECLS - -#endif /* __DFU_FORMAT_DFU_H */ diff --git a/plugins/dfu/dfu-format-dfuse.h b/plugins/dfu/dfu-format-dfuse.h index 4baf8224c..eec640498 100644 --- a/plugins/dfu/dfu-format-dfuse.h +++ b/plugins/dfu/dfu-format-dfuse.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_FORMAT_DFUSE_H -#define __DFU_FORMAT_DFUSE_H +#pragma once #include #include @@ -23,5 +22,3 @@ gboolean dfu_firmware_from_dfuse (DfuFirmware *firmware, GError **error); G_END_DECLS - -#endif /* __DFU_FORMAT_DFUSE_H */ diff --git a/plugins/dfu/dfu-format-ihex.h b/plugins/dfu/dfu-format-ihex.h index 6471136d1..217bd43d8 100644 --- a/plugins/dfu/dfu-format-ihex.h +++ b/plugins/dfu/dfu-format-ihex.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_FORMAT_IHEX_H -#define __DFU_FORMAT_IHEX_H +#pragma once #include #include @@ -23,5 +22,3 @@ gboolean dfu_firmware_from_ihex (DfuFirmware *firmware, GError **error); G_END_DECLS - -#endif /* __DFU_FORMAT_IHEX_H */ diff --git a/plugins/dfu/dfu-format-metadata.h b/plugins/dfu/dfu-format-metadata.h index 23cbb4e3a..c2ef034d3 100644 --- a/plugins/dfu/dfu-format-metadata.h +++ b/plugins/dfu/dfu-format-metadata.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_FORMAT_METADATA_H -#define __DFU_FORMAT_METADATA_H +#pragma once #include #include @@ -22,5 +21,3 @@ gboolean dfu_firmware_from_metadata (DfuFirmware *firmware, GError **error); G_END_DECLS - -#endif /* __DFU_FORMAT_METADATA_H */ diff --git a/plugins/dfu/dfu-format-raw.h b/plugins/dfu/dfu-format-raw.h index 2ae2510f1..ce86a8bae 100644 --- a/plugins/dfu/dfu-format-raw.h +++ b/plugins/dfu/dfu-format-raw.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_FORMAT_RAW_H -#define __DFU_FORMAT_RAW_H +#pragma once #include #include @@ -23,5 +22,3 @@ gboolean dfu_firmware_from_raw (DfuFirmware *firmware, GError **error); G_END_DECLS - -#endif /* __DFU_FORMAT_RAW_H */ diff --git a/plugins/dfu/dfu-format-srec.h b/plugins/dfu/dfu-format-srec.h index 51bf5770b..18be5054f 100644 --- a/plugins/dfu/dfu-format-srec.h +++ b/plugins/dfu/dfu-format-srec.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_FORMAT_SREC_H -#define __DFU_FORMAT_SREC_H +#pragma once #include #include @@ -28,5 +27,3 @@ gboolean dfu_image_from_srec (DfuImage *image, GError **error); G_END_DECLS - -#endif /* __DFU_FORMAT_SREC_H */ diff --git a/plugins/dfu/dfu-image.h b/plugins/dfu/dfu-image.h index 547e37ae7..9ac6573a3 100644 --- a/plugins/dfu/dfu-image.h +++ b/plugins/dfu/dfu-image.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_IMAGE_H -#define __DFU_IMAGE_H +#pragma once #include #include @@ -43,5 +42,3 @@ void dfu_image_set_name (DfuImage *image, gchar *dfu_image_to_string (DfuImage *image); G_END_DECLS - -#endif /* __DFU_IMAGE_H */ diff --git a/plugins/dfu/dfu-patch.h b/plugins/dfu/dfu-patch.h index abc19a557..5f6462f39 100644 --- a/plugins/dfu/dfu-patch.h +++ b/plugins/dfu/dfu-patch.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_PATCH_H -#define __DFU_PATCH_H +#pragma once #include #include @@ -54,5 +53,3 @@ GBytes *dfu_patch_get_checksum_old (DfuPatch *self); GBytes *dfu_patch_get_checksum_new (DfuPatch *self); G_END_DECLS - -#endif /* __DFU_PATCH_H */ diff --git a/plugins/dfu/dfu-sector-private.h b/plugins/dfu/dfu-sector-private.h index 93476bcaf..723aa30bc 100644 --- a/plugins/dfu/dfu-sector-private.h +++ b/plugins/dfu/dfu-sector-private.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_SECTOR_PRIVATE_H -#define __DFU_SECTOR_PRIVATE_H +#pragma once #include "dfu-sector.h" @@ -19,5 +18,3 @@ DfuSector *dfu_sector_new (guint32 address, DfuSectorCap cap); G_END_DECLS - -#endif /* __DFU_SECTOR_PRIVATE_H */ diff --git a/plugins/dfu/dfu-sector.h b/plugins/dfu/dfu-sector.h index c1289e939..8317cb8b0 100644 --- a/plugins/dfu/dfu-sector.h +++ b/plugins/dfu/dfu-sector.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_SECTOR_H -#define __DFU_SECTOR_H +#pragma once #include #include @@ -49,5 +48,3 @@ gboolean dfu_sector_has_cap (DfuSector *sector, gchar *dfu_sector_to_string (DfuSector *sector); G_END_DECLS - -#endif /* __DFU_SECTOR_H */ diff --git a/plugins/dfu/dfu-target-avr.h b/plugins/dfu/dfu-target-avr.h index 1b93575cb..7c3fff25b 100644 --- a/plugins/dfu/dfu-target-avr.h +++ b/plugins/dfu/dfu-target-avr.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_TARGET_AVR_H -#define __DFU_TARGET_AVR_H +#pragma once #include #include @@ -25,5 +24,3 @@ struct _DfuTargetAvrClass DfuTarget *dfu_target_avr_new (void); G_END_DECLS - -#endif /* __DFU_TARGET_AVR_H */ diff --git a/plugins/dfu/dfu-target-private.h b/plugins/dfu/dfu-target-private.h index 7ca44418c..6c6cafe9d 100644 --- a/plugins/dfu/dfu-target-private.h +++ b/plugins/dfu/dfu-target-private.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_TARGET_PRIVATE_H -#define __DFU_TARGET_PRIVATE_H +#pragma once #include @@ -56,5 +55,3 @@ gboolean dfu_target_parse_sectors (DfuTarget *target, GError **error); G_END_DECLS - -#endif /* __DFU_TARGET_PRIVATE_H */ diff --git a/plugins/dfu/dfu-target-stm.h b/plugins/dfu/dfu-target-stm.h index 4e234b8cc..5233ab022 100644 --- a/plugins/dfu/dfu-target-stm.h +++ b/plugins/dfu/dfu-target-stm.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_TARGET_STM_H -#define __DFU_TARGET_STM_H +#pragma once #include #include @@ -25,5 +24,3 @@ struct _DfuTargetStmClass DfuTarget *dfu_target_stm_new (void); G_END_DECLS - -#endif /* __DFU_TARGET_STM_H */ diff --git a/plugins/dfu/dfu-target.h b/plugins/dfu/dfu-target.h index 7c0987e2d..25148da9d 100644 --- a/plugins/dfu/dfu-target.h +++ b/plugins/dfu/dfu-target.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __DFU_TARGET_H -#define __DFU_TARGET_H +#pragma once #include #include @@ -91,5 +90,3 @@ gboolean dfu_target_mass_erase (DfuTarget *target, DfuCipherKind dfu_target_get_cipher_kind (DfuTarget *target); G_END_DECLS - -#endif /* __DFU_TARGET_H */ diff --git a/plugins/ebitdo/fu-ebitdo-common.h b/plugins/ebitdo/fu-ebitdo-common.h index 84f2e5248..79b1b98fe 100644 --- a/plugins/ebitdo/fu-ebitdo-common.h +++ b/plugins/ebitdo/fu-ebitdo-common.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_EBITDO_COMMON_H -#define __FU_EBITDO_COMMON_H +#pragma once #include @@ -70,5 +69,3 @@ const gchar *fu_ebitdo_pkt_cmd_to_string (FuEbitdoPktCmd cmd); const gchar *fu_ebitdo_pkt_type_to_string (FuEbitdoPktType type); void fu_ebitdo_dump_firmware_header (FuEbitdoFirmwareHeader *hdr); void fu_ebitdo_dump_pkt (FuEbitdoPkt *hdr); - -#endif /* __FU_EBITDO_COMMON_H */ diff --git a/plugins/ebitdo/fu-ebitdo-device.h b/plugins/ebitdo/fu-ebitdo-device.h index 46b8d68b9..617e1060b 100644 --- a/plugins/ebitdo/fu-ebitdo-device.h +++ b/plugins/ebitdo/fu-ebitdo-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_EBITDO_DEVICE_H -#define __FU_EBITDO_DEVICE_H +#pragma once #include "fu-plugin.h" @@ -20,5 +19,3 @@ FuEbitdoDevice *fu_ebitdo_device_new (FuUsbDevice *device); const guint32 *fu_ebitdo_device_get_serial (FuEbitdoDevice *device); G_END_DECLS - -#endif /* __FU_EBITDO_DEVICE_H */ diff --git a/plugins/fastboot/fu-fastboot-device.h b/plugins/fastboot/fu-fastboot-device.h index 5f44c9167..92886190e 100644 --- a/plugins/fastboot/fu-fastboot-device.h +++ b/plugins/fastboot/fu-fastboot-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_FASTBOOT_DEVICE_H -#define __FU_FASTBOOT_DEVICE_H +#pragma once #include "fu-plugin.h" @@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuFastbootDevice, fu_fastboot_device, FU, FASTBOOT_DEVICE, FuFastbootDevice *fu_fastboot_device_new (FuUsbDevice *device); G_END_DECLS - -#endif /* __FU_FASTBOOT_DEVICE_H */ diff --git a/plugins/nitrokey/fu-nitrokey-common.h b/plugins/nitrokey/fu-nitrokey-common.h index 894e1ba83..9b0551cc6 100644 --- a/plugins/nitrokey/fu-nitrokey-common.h +++ b/plugins/nitrokey/fu-nitrokey-common.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_NITROKEY_COMMON_H -#define __FU_NITROKEY_COMMON_H +#pragma once #include @@ -65,5 +64,3 @@ typedef struct __attribute__((packed)) { } NitrokeyGetDeviceStatusPayload; G_END_DECLS - -#endif /* __FU_NITROKEY_COMMON_H */ diff --git a/plugins/nitrokey/fu-nitrokey-device.h b/plugins/nitrokey/fu-nitrokey-device.h index 6fcebf77c..7b77fd405 100644 --- a/plugins/nitrokey/fu-nitrokey-device.h +++ b/plugins/nitrokey/fu-nitrokey-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_NITROKEY_DEVICE_H -#define __FU_NITROKEY_DEVICE_H +#pragma once #include "fu-plugin.h" @@ -22,5 +21,3 @@ struct _FuNitrokeyDeviceClass FuNitrokeyDevice *fu_nitrokey_device_new (FuUsbDevice *device); G_END_DECLS - -#endif /* __FU_NITROKEY_DEVICE_H */ diff --git a/plugins/nvme/fu-nvme-common.h b/plugins/nvme/fu-nvme-common.h index 0cdac7782..4287c9524 100644 --- a/plugins/nvme/fu-nvme-common.h +++ b/plugins/nvme/fu-nvme-common.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_NVME_COMMON_H -#define __FU_NVME_COMMON_H +#pragma once #include @@ -125,5 +124,3 @@ enum { const gchar *fu_nvme_status_to_string (guint32 status); G_END_DECLS - -#endif /* __FU_NVME_COMMON_H */ diff --git a/plugins/nvme/fu-nvme-device.h b/plugins/nvme/fu-nvme-device.h index 53621e55e..f30d2ed35 100644 --- a/plugins/nvme/fu-nvme-device.h +++ b/plugins/nvme/fu-nvme-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_NVME_DEVICE_H -#define __FU_NVME_DEVICE_H +#pragma once #include "fu-plugin.h" @@ -20,5 +19,3 @@ FuNvmeDevice *fu_nvme_device_new_from_blob (const guint8 *buf, GError **error); G_END_DECLS - -#endif /* __FU_NVME_DEVICE_H */ diff --git a/plugins/redfish/fu-redfish-client.h b/plugins/redfish/fu-redfish-client.h index b55c59d79..fd8512493 100644 --- a/plugins/redfish/fu-redfish-client.h +++ b/plugins/redfish/fu-redfish-client.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_REDFISH_CLIENT_H -#define __FU_REDFISH_CLIENT_H +#pragma once #include @@ -40,7 +39,3 @@ gboolean fu_redfish_client_coldplug (FuRedfishClient *self, GPtrArray *fu_redfish_client_get_devices (FuRedfishClient *self); G_END_DECLS - -#endif /* __FU_REDFISH_CLIENT_H */ - -/* vim: set noexpandtab: */ diff --git a/plugins/redfish/fu-redfish-common.h b/plugins/redfish/fu-redfish-common.h index f20fba75b..b54b88e66 100644 --- a/plugins/redfish/fu-redfish-common.h +++ b/plugins/redfish/fu-redfish-common.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_REDFISH_COMMON_H -#define __FU_REDFISH_COMMON_H +#pragma once #include #include @@ -49,7 +48,3 @@ gchar *fu_redfish_common_buffer_to_ipv4 (const guint8 *buffer); gchar *fu_redfish_common_buffer_to_ipv6 (const guint8 *buffer); G_END_DECLS - -#endif /* __FU_REDFISH_COMMON_H */ - -/* vim: set noexpandtab: */ diff --git a/plugins/rts54hid/fu-rts54hid-common.h b/plugins/rts54hid/fu-rts54hid-common.h index 2f66faf0a..069b0c301 100644 --- a/plugins/rts54hid/fu-rts54hid-common.h +++ b/plugins/rts54hid/fu-rts54hid-common.h @@ -6,8 +6,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_RTS54HID_COMMON_H -#define __FU_RTS54HID_COMMON_H +#pragma once #define FU_RTS54HID_TRANSFER_BLOCK_SIZE 0x80 #define FU_RTS54HID_REPORT_LENGTH 0xc0 @@ -68,5 +67,3 @@ typedef enum { /* */ FU_RTS54HID_EXT_LAST, } FuRts54HidExt; - -#endif /* __FU_RTS54HID_COMMON_H */ diff --git a/plugins/rts54hid/fu-rts54hid-device.h b/plugins/rts54hid/fu-rts54hid-device.h index 02c872d24..2e2f80c7d 100644 --- a/plugins/rts54hid/fu-rts54hid-device.h +++ b/plugins/rts54hid/fu-rts54hid-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_RTS54HID_DEVICE_H -#define __FU_RTS54HID_DEVICE_H +#pragma once #include "fu-plugin.h" @@ -25,5 +24,3 @@ gboolean fu_rts54hid_device_get_report (FuRts54HidDevice *self, GError **error); G_END_DECLS - -#endif /* __FU_RTS54HID_DEVICE_H */ diff --git a/plugins/rts54hid/fu-rts54hid-module.h b/plugins/rts54hid/fu-rts54hid-module.h index e94ea2337..6b4a4befa 100644 --- a/plugins/rts54hid/fu-rts54hid-module.h +++ b/plugins/rts54hid/fu-rts54hid-module.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_RTS54HID_MODULE_H -#define __FU_RTS54HID_MODULE_H +#pragma once #include "fu-plugin.h" @@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuRts54HidModule, fu_rts54hid_module, FU, RTS54HID_MODULE, FuRts54HidModule *fu_rts54hid_module_new (void); G_END_DECLS - -#endif /* __FU_RTS54HID_MODULE_H */ diff --git a/plugins/rts54hub/fu-rts54hub-device.h b/plugins/rts54hub/fu-rts54hub-device.h index e0adc1a0d..de0f8f438 100644 --- a/plugins/rts54hub/fu-rts54hub-device.h +++ b/plugins/rts54hub/fu-rts54hub-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_RTS54HUB_DEVICE_H -#define __FU_RTS54HUB_DEVICE_H +#pragma once #include "fu-plugin.h" @@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuRts54HubDevice, fu_rts54hub_device, FU, RTS54HUB_DEVICE, FuRts54HubDevice *fu_rts54hub_device_new (FuUsbDevice *device); G_END_DECLS - -#endif /* __FU_RTS54HUB_DEVICE_H */ diff --git a/plugins/steelseries/fu-steelseries-device.h b/plugins/steelseries/fu-steelseries-device.h index 6c6c1f4f5..90068b105 100644 --- a/plugins/steelseries/fu-steelseries-device.h +++ b/plugins/steelseries/fu-steelseries-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_STEELSERIES_DEVICE_H -#define __FU_STEELSERIES_DEVICE_H +#pragma once #include "fu-plugin.h" @@ -22,5 +21,3 @@ struct _FuSteelseriesDeviceClass FuSteelseriesDevice *fu_steelseries_device_new (FuUsbDevice *device); G_END_DECLS - -#endif /* __FU_STEELSERIES_DEVICE_H */ diff --git a/plugins/superio/fu-superio-common.h b/plugins/superio/fu-superio-common.h index ed2b9d2a4..7ed397ea3 100644 --- a/plugins/superio/fu-superio-common.h +++ b/plugins/superio/fu-superio-common.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_SUPERIO_COMMON_H -#define __FU_SUPERIO_COMMON_H +#pragma once #include "fu-plugin.h" @@ -47,5 +46,3 @@ gboolean fu_superio_set_ldn (gint fd, GError **error); G_END_DECLS - -#endif /* __FU_SUPERIO_COMMON_H */ diff --git a/plugins/superio/fu-superio-device.h b/plugins/superio/fu-superio-device.h index de7722e67..1f333c655 100644 --- a/plugins/superio/fu-superio-device.h +++ b/plugins/superio/fu-superio-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_SUPERIO_DEVICE_H -#define __FU_SUPERIO_DEVICE_H +#pragma once #include "fu-plugin.h" @@ -19,5 +18,3 @@ FuSuperioDevice *fu_superio_device_new (const gchar *chipset, guint16 port); G_END_DECLS - -#endif /* __FU_SUPERIO_DEVICE_H */ diff --git a/plugins/synapticsmst/synapticsmst-common.h b/plugins/synapticsmst/synapticsmst-common.h index 4d1d6076e..cc01b0338 100644 --- a/plugins/synapticsmst/synapticsmst-common.h +++ b/plugins/synapticsmst/synapticsmst-common.h @@ -5,8 +5,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __SYNAPTICSMST_COMMON_H -#define __SYNAPTICSMST_COMMON_H +#pragma once #include #include @@ -108,5 +107,3 @@ gboolean synapticsmst_common_disable_remote_control (SynapticsMSTConnection *co #pragma clang diagnostic ignored "-Wunused-function" G_DEFINE_AUTOPTR_CLEANUP_FUNC(SynapticsMSTConnection, synapticsmst_common_free) #pragma clang diagnostic pop - -#endif /* __SYNAPTICSMST_COMMON_H */ diff --git a/plugins/synapticsmst/synapticsmst-device.h b/plugins/synapticsmst/synapticsmst-device.h index c3bc4a579..401a22150 100644 --- a/plugins/synapticsmst/synapticsmst-device.h +++ b/plugins/synapticsmst/synapticsmst-device.h @@ -6,8 +6,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __SYNAPTICSMST_DEVICE_H -#define __SYNAPTICSMST_DEVICE_H +#pragma once #include @@ -86,5 +85,3 @@ gboolean synapticsmst_device_write_firmware (SynapticsMSTDevice *device, GError **error); G_END_DECLS - -#endif /* __SYNAPTICSMST_DEVICE_H */ diff --git a/plugins/thunderbolt/fu-thunderbolt-image.h b/plugins/thunderbolt/fu-thunderbolt-image.h index ee7d000ce..c9b25a02e 100644 --- a/plugins/thunderbolt/fu-thunderbolt-image.h +++ b/plugins/thunderbolt/fu-thunderbolt-image.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_THUNDERBOLT_IMAGE_H__ -#define __FU_THUNDERBOLT_IMAGE_H__ +#pragma once #include @@ -26,5 +25,3 @@ FuPluginValidation fu_thunderbolt_image_validate (GBytes *controller_fw, gboolean fu_thunderbolt_image_controller_is_native (GBytes *controller_fw, gboolean *is_native, GError **error); - -#endif /* __FU_THUNDERBOLT_IMAGE_H__ */ diff --git a/plugins/udev/fu-rom.h b/plugins/udev/fu-rom.h index 295ab0f18..dea2b0edb 100644 --- a/plugins/udev/fu-rom.h +++ b/plugins/udev/fu-rom.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_ROM_H -#define __FU_ROM_H +#pragma once #include @@ -54,6 +53,3 @@ guint16 fu_rom_get_model (FuRom *self); const gchar *fu_rom_kind_to_string (FuRomKind kind); G_END_DECLS - -#endif /* __FU_ROM_H */ - diff --git a/plugins/uefi/efi/fwup-cleanups.h b/plugins/uefi/efi/fwup-cleanups.h index ff5328f7c..6058ce51a 100644 --- a/plugins/uefi/efi/fwup-cleanups.h +++ b/plugins/uefi/efi/fwup-cleanups.h @@ -4,6 +4,8 @@ * SPDX-License-Identifier: LGPL-2.1+ */ +#pragma once + #define _DEFINE_CLEANUP_FUNCTION0(Type, name, func) \ static inline VOID name(VOID *v) \ { \ diff --git a/plugins/uefi/efi/fwup-common.h b/plugins/uefi/efi/fwup-common.h index 9aee941c1..e4c8b773b 100644 --- a/plugins/uefi/efi/fwup-common.h +++ b/plugins/uefi/efi/fwup-common.h @@ -5,8 +5,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef _FWUP_COMMON_H -#define _FWUP_COMMON_H +#pragma once #include "fwup-efi.h" @@ -22,5 +21,3 @@ VOID *fwup_malloc0 (UINTN size); #define fwup_new(struct_type, n) ((struct_type*)fwup_malloc((n)*sizeof(struct_type))) #define fwup_new0(struct_type, n) ((struct_type*)fwup_malloc0((n)*sizeof(struct_type))) - -#endif /* _FWUP_COMMON_H */ diff --git a/plugins/uefi/efi/fwup-debug.h b/plugins/uefi/efi/fwup-debug.h index 1e1de2198..242e0a268 100644 --- a/plugins/uefi/efi/fwup-debug.h +++ b/plugins/uefi/efi/fwup-debug.h @@ -5,8 +5,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef _FWUP_DEBUG_H -#define _FWUP_DEBUG_H +#pragma once typedef enum { FWUP_DEBUG_LEVEL_DEBUG, @@ -28,5 +27,3 @@ VOID fwup_debug_set_enabled (BOOLEAN val); #define fwup_debug(fmt, args...) fwup_log(FWUP_DEBUG_LEVEL_DEBUG, __func__, __FILE__, __LINE__, fmt, ## args ) #define fwup_info(fmt, args...) fwup_log(FWUP_DEBUG_LEVEL_INFO, __func__, __FILE__, __LINE__, fmt, ## args ) #define fwup_warning(fmt, args...) fwup_log(FWUP_DEBUG_LEVEL_WARNING, __func__, __FILE__, __LINE__, fmt, ## args ) - -#endif /* _FWUP_DEBUG_H */ diff --git a/plugins/uefi/efi/fwup-efi.h b/plugins/uefi/efi/fwup-efi.h index bb2a8092e..58a05dc21 100644 --- a/plugins/uefi/efi/fwup-efi.h +++ b/plugins/uefi/efi/fwup-efi.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef _FWUP_EFI_H -#define _FWUP_EFI_H +#pragma once #define FWUPDATE_ATTEMPT_UPDATE 0x00000001 #define FWUPDATE_ATTEMPTED 0x00000002 @@ -68,5 +67,3 @@ EFI_STATUS fwup_get_variable (CHAR16 *name, VOID **buf_out, UINTN *buf_size_out, UINT32 *attrs_out); - -#endif /* _FWUP_EFI_H */ diff --git a/plugins/uefi/fu-ucs2.h b/plugins/uefi/fu-ucs2.h index e695f79cf..21b514c71 100644 --- a/plugins/uefi/fu-ucs2.h +++ b/plugins/uefi/fu-ucs2.h @@ -5,8 +5,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UCS2_H -#define __FU_UCS2_H +#pragma once #include @@ -16,5 +15,3 @@ guint16 *fu_uft8_to_ucs2 (const gchar *str, gssize max); gchar *fu_ucs2_to_uft8 (const guint16 *str, gssize max); - -#endif /* __FU_UCS2_H */ diff --git a/plugins/uefi/fu-uefi-bgrt.h b/plugins/uefi/fu-uefi-bgrt.h index 1f6561fef..952bb8206 100644 --- a/plugins/uefi/fu-uefi-bgrt.h +++ b/plugins/uefi/fu-uefi-bgrt.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UEFI_BGRT_H -#define __FU_UEFI_BGRT_H +#pragma once G_BEGIN_DECLS @@ -22,5 +21,3 @@ guint32 fu_uefi_bgrt_get_width (FuUefiBgrt *self); guint32 fu_uefi_bgrt_get_height (FuUefiBgrt *self); G_END_DECLS - -#endif /* __FU_UEFI_BGRT_H */ diff --git a/plugins/uefi/fu-uefi-bootmgr.h b/plugins/uefi/fu-uefi-bootmgr.h index 07622cd67..99eeade6b 100644 --- a/plugins/uefi/fu-uefi-bootmgr.h +++ b/plugins/uefi/fu-uefi-bootmgr.h @@ -5,8 +5,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UEFI_BOOTMGR_H -#define __FU_UEFI_BOOTMGR_H +#pragma once #include #include @@ -25,5 +24,3 @@ gboolean fu_uefi_bootmgr_bootnext (const gchar *esp_path, GError **error); G_END_DECLS - -#endif /* __FU_UEFI_BOOTMGR_H */ diff --git a/plugins/uefi/fu-uefi-common.h b/plugins/uefi/fu-uefi-common.h index 9e06ffa33..535ac1837 100644 --- a/plugins/uefi/fu-uefi-common.h +++ b/plugins/uefi/fu-uefi-common.h @@ -5,8 +5,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UEFI_COMMON_H -#define __FU_UEFI_COMMON_H +#pragma once #include #include @@ -87,5 +86,3 @@ guint64 fu_uefi_read_file_as_uint64 (const gchar *path, gboolean fu_uefi_prefix_efi_errors (GError **error); G_END_DECLS - -#endif /* __FU_UEFI_COMMON_H */ diff --git a/plugins/uefi/fu-uefi-device.h b/plugins/uefi/fu-uefi-device.h index 98aee51b4..20a7b8dee 100644 --- a/plugins/uefi/fu-uefi-device.h +++ b/plugins/uefi/fu-uefi-device.h @@ -5,8 +5,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UEFI_DEVICE_H -#define __FU_UEFI_DEVICE_H +#pragma once #include "fu-plugin.h" #include "fu-uefi-device.h" @@ -60,5 +59,3 @@ FuUefiUpdateInfo *fu_uefi_device_load_update_info (FuUefiDevice *self, gboolean fu_uefi_missing_capsule_header (FuDevice *device); G_END_DECLS - -#endif /* __FU_UEFI_DEVICE_H */ diff --git a/plugins/uefi/fu-uefi-pcrs.h b/plugins/uefi/fu-uefi-pcrs.h index 9837a9add..01c0043ec 100644 --- a/plugins/uefi/fu-uefi-pcrs.h +++ b/plugins/uefi/fu-uefi-pcrs.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UEFI_PCRS_H -#define __FU_UEFI_PCRS_H +#pragma once G_BEGIN_DECLS @@ -19,5 +18,3 @@ GPtrArray *fu_uefi_pcrs_get_checksums (FuUefiPcrs *self, guint idx); G_END_DECLS - -#endif /* __FU_UEFI_PCRS_H */ diff --git a/plugins/uefi/fu-uefi-update-info.h b/plugins/uefi/fu-uefi-update-info.h index b361b4781..4c853a6a8 100644 --- a/plugins/uefi/fu-uefi-update-info.h +++ b/plugins/uefi/fu-uefi-update-info.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UEFI_UPDATE_INFO_H -#define __FU_UEFI_UPDATE_INFO_H +#pragma once G_BEGIN_DECLS @@ -32,5 +31,3 @@ guint64 fu_uefi_update_info_get_hw_inst (FuUefiUpdateInfo *self); FuUefiUpdateInfoStatus fu_uefi_update_info_get_status (FuUefiUpdateInfo *self); G_END_DECLS - -#endif /* __FU_UEFI_UPDATE_INFO_H */ diff --git a/plugins/uefi/fu-uefi-vars.h b/plugins/uefi/fu-uefi-vars.h index 8528475dd..04cffa74e 100644 --- a/plugins/uefi/fu-uefi-vars.h +++ b/plugins/uefi/fu-uefi-vars.h @@ -5,8 +5,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UEFI_VARS_H -#define __FU_UEFI_VARS_H +#pragma once #include @@ -47,5 +46,3 @@ gboolean fu_uefi_vars_delete_with_glob (const gchar *guid, GError **error); G_END_DECLS - -#endif /* __FU_UEFI_VARS_H */ diff --git a/plugins/unifying/fu-unifying-bootloader-nordic.h b/plugins/unifying/fu-unifying-bootloader-nordic.h index e577d6f82..2e77ccb7f 100644 --- a/plugins/unifying/fu-unifying-bootloader-nordic.h +++ b/plugins/unifying/fu-unifying-bootloader-nordic.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UNIFYING_BOOTLOADER_NORDIC_H -#define __FU_UNIFYING_BOOTLOADER_NORDIC_H +#pragma once #include "fu-unifying-bootloader.h" @@ -15,5 +14,3 @@ G_BEGIN_DECLS G_DECLARE_FINAL_TYPE (FuUnifyingBootloaderNordic, fu_unifying_bootloader_nordic, FU, UNIFYING_BOOTLOADER_NORDIC, FuUnifyingBootloader) G_END_DECLS - -#endif /* __FU_UNIFYING_BOOTLOADER_NORDIC_H */ diff --git a/plugins/unifying/fu-unifying-bootloader-texas.h b/plugins/unifying/fu-unifying-bootloader-texas.h index b28ec8f27..c68acd2e4 100644 --- a/plugins/unifying/fu-unifying-bootloader-texas.h +++ b/plugins/unifying/fu-unifying-bootloader-texas.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UNIFYING_BOOTLOADER_TEXAS_H -#define __FU_UNIFYING_BOOTLOADER_TEXAS_H +#pragma once #include "fu-unifying-bootloader.h" @@ -15,5 +14,3 @@ G_BEGIN_DECLS G_DECLARE_FINAL_TYPE (FuUnifyingBootloaderTexas, fu_unifying_bootloader_texas, FU, UNIFYING_BOOTLOADER_TEXAS, FuUnifyingBootloader) G_END_DECLS - -#endif /* __FU_UNIFYING_BOOTLOADER_TEXAS_H */ diff --git a/plugins/unifying/fu-unifying-bootloader.h b/plugins/unifying/fu-unifying-bootloader.h index 6e5850f9f..60bb50b1b 100644 --- a/plugins/unifying/fu-unifying-bootloader.h +++ b/plugins/unifying/fu-unifying-bootloader.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UNIFYING_BOOTLOADER_H -#define __FU_UNIFYING_BOOTLOADER_H +#pragma once #include "fu-usb-device.h" @@ -79,5 +78,3 @@ guint16 fu_unifying_bootloader_get_addr_hi (FuUnifyingBootloader *self); guint16 fu_unifying_bootloader_get_blocksize (FuUnifyingBootloader *self); G_END_DECLS - -#endif /* __FU_UNIFYING_BOOTLOADER_H */ diff --git a/plugins/unifying/fu-unifying-common.h b/plugins/unifying/fu-unifying-common.h index a4f898863..15db475cb 100644 --- a/plugins/unifying/fu-unifying-common.h +++ b/plugins/unifying/fu-unifying-common.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UNIFYING_COMMON_H -#define __FU_UNIFYING_COMMON_H +#pragma once #include @@ -31,5 +30,3 @@ gchar *fu_unifying_format_version (const gchar *name, guint16 build); G_END_DECLS - -#endif /* __FU_UNIFYING_COMMON_H */ diff --git a/plugins/unifying/fu-unifying-hidpp-msg.h b/plugins/unifying/fu-unifying-hidpp-msg.h index fcd19b890..931bb382d 100644 --- a/plugins/unifying/fu-unifying-hidpp-msg.h +++ b/plugins/unifying/fu-unifying-hidpp-msg.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UNIFYING_HIDPP_MSG_H -#define __FU_UNIFYING_HIDPP_MSG_H +#pragma once #include @@ -57,5 +56,3 @@ const gchar *fu_unifying_hidpp_msg_sub_id_to_string (FuUnifyingHidppMsg *msg); const gchar *fu_unifying_hidpp_msg_fcn_id_to_string (FuUnifyingHidppMsg *msg); G_END_DECLS - -#endif /* __FU_UNIFYING_HIDPP_MSG_H */ diff --git a/plugins/unifying/fu-unifying-hidpp.h b/plugins/unifying/fu-unifying-hidpp.h index bcc05dd4f..689f8577d 100644 --- a/plugins/unifying/fu-unifying-hidpp.h +++ b/plugins/unifying/fu-unifying-hidpp.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UNIFYING_HIDPP_H -#define __FU_UNIFYING_HIDPP_H +#pragma once #include @@ -151,5 +150,3 @@ gboolean fu_unifying_hidpp_transfer (FuIOChannel *self, GError **error); G_END_DECLS - -#endif /* __FU_UNIFYING_HIDPP_H */ diff --git a/plugins/unifying/fu-unifying-peripheral.h b/plugins/unifying/fu-unifying-peripheral.h index f05fe407f..fe5a9d7a2 100644 --- a/plugins/unifying/fu-unifying-peripheral.h +++ b/plugins/unifying/fu-unifying-peripheral.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UNIFYING_PERIPHERAL_H -#define __FU_UNIFYING_PERIPHERAL_H +#pragma once #include "fu-udev-device.h" @@ -15,5 +14,3 @@ G_BEGIN_DECLS G_DECLARE_FINAL_TYPE (FuUnifyingPeripheral, fu_unifying_peripheral, FU, UNIFYING_PERIPHERAL, FuUdevDevice) G_END_DECLS - -#endif /* __FU_UNIFYING_PERIPHERAL_H */ diff --git a/plugins/unifying/fu-unifying-runtime.h b/plugins/unifying/fu-unifying-runtime.h index d6ebfddfd..a3fa5b3b0 100644 --- a/plugins/unifying/fu-unifying-runtime.h +++ b/plugins/unifying/fu-unifying-runtime.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UNIFYING_DEVICE_RUNTIME_H -#define __FU_UNIFYING_DEVICE_RUNTIME_H +#pragma once #include "fu-udev-device.h" @@ -15,5 +14,3 @@ G_BEGIN_DECLS G_DECLARE_FINAL_TYPE (FuUnifyingRuntime, fu_unifying_runtime, FU, UNIFYING_RUNTIME, FuUdevDevice) G_END_DECLS - -#endif /* __FU_UNIFYING_DEVICE_RUNTIME_H */ diff --git a/plugins/wacom-raw/fu-wacom-aes-device.h b/plugins/wacom-raw/fu-wacom-aes-device.h index 07c61c5b8..7334f5897 100644 --- a/plugins/wacom-raw/fu-wacom-aes-device.h +++ b/plugins/wacom-raw/fu-wacom-aes-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_WACOM_AES_DEVICE_H -#define __FU_WACOM_AES_DEVICE_H +#pragma once #include "fu-wacom-device.h" @@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuWacomAesDevice, fu_wacom_aes_device, FU, WACOM_AES_DEVIC FuWacomAesDevice *fu_wacom_aes_device_new (FuUdevDevice *device); G_END_DECLS - -#endif /* __FU_WACOM_AES_DEVICE_H */ diff --git a/plugins/wacom-raw/fu-wacom-common.h b/plugins/wacom-raw/fu-wacom-common.h index c142c0e48..62ac98a65 100644 --- a/plugins/wacom-raw/fu-wacom-common.h +++ b/plugins/wacom-raw/fu-wacom-common.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_WACOM_COMMON_H -#define __FU_WACOM_COMMON_H +#pragma once #include @@ -76,5 +75,3 @@ gboolean fu_wacom_common_block_is_empty (const guint8 *data, guint16 datasz); G_END_DECLS - -#endif /* __FU_WACOM_COMMON_H */ diff --git a/plugins/wacom-raw/fu-wacom-device.h b/plugins/wacom-raw/fu-wacom-device.h index 383ceb3b7..0959eede7 100644 --- a/plugins/wacom-raw/fu-wacom-device.h +++ b/plugins/wacom-raw/fu-wacom-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_WACOM_DEVICE_H -#define __FU_WACOM_DEVICE_H +#pragma once #include "fu-wacom-common.h" #include "fu-udev-device.h" @@ -52,5 +51,3 @@ guint fu_wacom_device_get_block_sz (FuWacomDevice *self); guint fu_wacom_device_get_base_addr (FuWacomDevice *self); G_END_DECLS - -#endif /* __FU_WACOM_DEVICE_H */ diff --git a/plugins/wacom-raw/fu-wacom-emr-device.h b/plugins/wacom-raw/fu-wacom-emr-device.h index 6a7cc35be..6cc00257e 100644 --- a/plugins/wacom-raw/fu-wacom-emr-device.h +++ b/plugins/wacom-raw/fu-wacom-emr-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_WACOM_EMR_DEVICE_H -#define __FU_WACOM_EMR_DEVICE_H +#pragma once #include "fu-wacom-device.h" @@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuWacomEmrDevice, fu_wacom_emr_device, FU, WACOM_EMR_DEVIC FuWacomEmrDevice *fu_wacom_emr_device_new (FuUdevDevice *device); G_END_DECLS - -#endif /* __FU_WACOM_EMR_DEVICE_H */ diff --git a/plugins/wacom-usb/fu-wac-common.h b/plugins/wacom-usb/fu-wac-common.h index 19397e649..7cdfc4b6f 100644 --- a/plugins/wacom-usb/fu-wac-common.h +++ b/plugins/wacom-usb/fu-wac-common.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_WAC_HID_H -#define __FU_WAC_HID_H +#pragma once #include @@ -50,5 +49,3 @@ void fu_wac_buffer_dump (const gchar *title, gsize sz); G_END_DECLS - -#endif /* __FU_WAC_HID_H */ diff --git a/plugins/wacom-usb/fu-wac-device.h b/plugins/wacom-usb/fu-wac-device.h index a074d4626..84d05cb3d 100644 --- a/plugins/wacom-usb/fu-wac-device.h +++ b/plugins/wacom-usb/fu-wac-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_WAC_DEVICE_H -#define __FU_WAC_DEVICE_H +#pragma once #include "fu-plugin.h" @@ -35,5 +34,3 @@ gboolean fu_wac_device_set_feature_report (FuWacDevice *self, GError **error); G_END_DECLS - -#endif /* __FU_WAC_DEVICE_H */ diff --git a/plugins/wacom-usb/fu-wac-firmware.h b/plugins/wacom-usb/fu-wac-firmware.h index fcbbef9ab..29221a44e 100644 --- a/plugins/wacom-usb/fu-wac-firmware.h +++ b/plugins/wacom-usb/fu-wac-firmware.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_WAC_FIRMWARE_H -#define __FU_WAC_FIRMWARE_H +#pragma once #include @@ -19,5 +18,3 @@ gboolean fu_wac_firmware_parse_data (DfuFirmware *firmware, GError **error); G_END_DECLS - -#endif /* __FU_WAC_FIRMWARE_H */ diff --git a/plugins/wacom-usb/fu-wac-module-bluetooth.h b/plugins/wacom-usb/fu-wac-module-bluetooth.h index 1ed73a9bf..d66d3f13d 100644 --- a/plugins/wacom-usb/fu-wac-module-bluetooth.h +++ b/plugins/wacom-usb/fu-wac-module-bluetooth.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_WAC_MODULE_BLUETOOTH_H -#define __FU_WAC_MODULE_BLUETOOTH_H +#pragma once #include "fu-wac-module.h" @@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuWacModuleBluetooth, fu_wac_module_bluetooth, FU, WAC_MOD FuWacModule *fu_wac_module_bluetooth_new (GUsbDevice *usb_device); G_END_DECLS - -#endif /* __FU_WAC_MODULE_BLUETOOTH_H */ diff --git a/plugins/wacom-usb/fu-wac-module-touch.h b/plugins/wacom-usb/fu-wac-module-touch.h index ef682453a..53e9feff0 100644 --- a/plugins/wacom-usb/fu-wac-module-touch.h +++ b/plugins/wacom-usb/fu-wac-module-touch.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_WAC_MODULE_TOUCH_H -#define __FU_WAC_MODULE_TOUCH_H +#pragma once #include "fu-wac-module.h" @@ -17,5 +16,3 @@ G_DECLARE_FINAL_TYPE (FuWacModuleTouch, fu_wac_module_touch, FU, WAC_MODULE_TOUC FuWacModule *fu_wac_module_touch_new (GUsbDevice *usb_device); G_END_DECLS - -#endif /* __FU_WAC_MODULE_TOUCH_H */ diff --git a/plugins/wacom-usb/fu-wac-module.h b/plugins/wacom-usb/fu-wac-module.h index 52fa21ea5..8dd09bb1b 100644 --- a/plugins/wacom-usb/fu-wac-module.h +++ b/plugins/wacom-usb/fu-wac-module.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_WAC_MODULE_H -#define __FU_WAC_MODULE_H +#pragma once #include "fu-plugin.h" @@ -35,5 +34,3 @@ gboolean fu_wac_module_set_feature (FuWacModule *self, GError **error); G_END_DECLS - -#endif /* __FU_WAC_MODULE_H */ diff --git a/src/fu-archive.h b/src/fu-archive.h index 90a9db2a2..190a1dd46 100644 --- a/src/fu-archive.h +++ b/src/fu-archive.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_ARCHIVE_H -#define __FU_ARCHIVE_H +#pragma once #include @@ -54,5 +53,3 @@ void fu_archive_iterate (FuArchive *self, gpointer user_data); G_END_DECLS - -#endif /* __FU_ARCHIVE_H */ diff --git a/src/fu-chunk.h b/src/fu-chunk.h index 74eedd3fa..9cde630cf 100644 --- a/src/fu-chunk.h +++ b/src/fu-chunk.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_CHUNK_H -#define __FU_CHUNK_H +#pragma once #include #include @@ -39,5 +38,3 @@ GPtrArray *fu_chunk_array_new_from_bytes (GBytes *blob, guint32 packet_sz); G_END_DECLS - -#endif /* __FU_CHUNK_H */ diff --git a/src/fu-common-cab.h b/src/fu-common-cab.h index 2f1da8d9f..daaef1e4e 100644 --- a/src/fu-common-cab.h +++ b/src/fu-common-cab.h @@ -4,13 +4,10 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_COMMON_CAB_H -#define __FU_COMMON_CAB_H +#pragma once #include XbSilo *fu_common_cab_build_silo (GBytes *blob, guint64 size_max, GError **error); - -#endif /* __FU_COMMON_CAB_H */ diff --git a/src/fu-common-guid.h b/src/fu-common-guid.h index f9e9890c0..16c9b86c0 100644 --- a/src/fu-common-guid.h +++ b/src/fu-common-guid.h @@ -4,11 +4,8 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_COMMON_GUID_H__ -#define __FU_COMMON_GUID_H__ +#pragma once #include gboolean fu_common_guid_is_plausible (const guint8 *buf); - -#endif /* __FU_COMMON_GUID_H__ */ diff --git a/src/fu-common-version.h b/src/fu-common-version.h index 3538316b9..3cd797b9e 100644 --- a/src/fu-common-version.h +++ b/src/fu-common-version.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_COMMON_VERSION_H__ -#define __FU_COMMON_VERSION_H__ +#pragma once #include @@ -46,5 +45,3 @@ gchar *fu_common_version_from_uint16 (guint16 val, FuVersionFormat flags); gchar *fu_common_version_parse (const gchar *version); FuVersionFormat fu_common_version_guess_format (const gchar *version); - -#endif /* __FU_COMMON_VERSION_H__ */ diff --git a/src/fu-common.h b/src/fu-common.h index 9c7252195..fd9f5be96 100644 --- a/src/fu-common.h +++ b/src/fu-common.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_COMMON_H__ -#define __FU_COMMON_H__ +#pragma once #include @@ -106,5 +105,3 @@ guint32 fu_common_read_uint32 (const guint8 *buf, guint fu_common_string_replace (GString *string, const gchar *search, const gchar *replace); - -#endif /* __FU_COMMON_H__ */ diff --git a/src/fu-config.h b/src/fu-config.h index a429cf32b..9306c1624 100644 --- a/src/fu-config.h +++ b/src/fu-config.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_CONFIG_H -#define __FU_CONFIG_H +#pragma once G_BEGIN_DECLS @@ -29,6 +28,3 @@ FwupdRemote *fu_config_get_remote_by_id (FuConfig *self, const gchar *remote_id); G_END_DECLS - -#endif /* __FU_CONFIG_H */ - diff --git a/src/fu-debug.h b/src/fu-debug.h index bdf17bbf6..19dc5b40d 100644 --- a/src/fu-debug.h +++ b/src/fu-debug.h @@ -4,11 +4,8 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_DEBUG_H__ -#define __FU_DEBUG_H__ +#pragma once #include GOptionGroup *fu_debug_get_option_group (void); - -#endif /* __FU_DEBUG_H__ */ diff --git a/src/fu-device-list.h b/src/fu-device-list.h index dbe2edcf1..597041a76 100644 --- a/src/fu-device-list.h +++ b/src/fu-device-list.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_DEVICE_LIST_H -#define __FU_DEVICE_LIST_H +#pragma once G_BEGIN_DECLS @@ -36,6 +35,3 @@ gboolean fu_device_list_wait_for_replug (FuDeviceList *self, GError **error); G_END_DECLS - -#endif /* __FU_DEVICE_LIST_H */ - diff --git a/src/fu-device-locker.h b/src/fu-device-locker.h index db95be764..16c1cbb6f 100644 --- a/src/fu-device-locker.h +++ b/src/fu-device-locker.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_DEVICE_LOCKER_H -#define __FU_DEVICE_LOCKER_H +#pragma once #include @@ -26,5 +25,3 @@ FuDeviceLocker *fu_device_locker_new_full (gpointer device, GError **error); G_END_DECLS - -#endif /* __FU_DEVICE_LOCKER_H */ diff --git a/src/fu-device-metadata.h b/src/fu-device-metadata.h index 693513dca..a4bb68cae 100644 --- a/src/fu-device-metadata.h +++ b/src/fu-device-metadata.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_DEVICE_METADATA_H__ -#define __FU_DEVICE_METADATA_H__ +#pragma once /** * SECTION:fu-device-metadata @@ -41,5 +40,3 @@ * need to be handled as a capsule update. */ #define FU_DEVICE_METADATA_UEFI_DEVICE_KIND "UefiDeviceKind" - -#endif /* __FU_DEVICE_METADATA_H__ */ diff --git a/src/fu-device-private.h b/src/fu-device-private.h index a91215fa1..02b1d0ecc 100644 --- a/src/fu-device-private.h +++ b/src/fu-device-private.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_DEVICE_PRIVATE_H -#define __FU_DEVICE_PRIVATE_H +#pragma once #include #include @@ -32,6 +31,3 @@ void fu_device_incorporate_from_component (FuDevice *device, void fu_device_convert_instance_ids (FuDevice *self); G_END_DECLS - -#endif /* __FU_DEVICE_PRIVATE_H */ - diff --git a/src/fu-device.h b/src/fu-device.h index 756262540..1cfa4e253 100644 --- a/src/fu-device.h +++ b/src/fu-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_DEVICE_H -#define __FU_DEVICE_H +#pragma once #include #include @@ -228,6 +227,3 @@ void fu_device_set_poll_interval (FuDevice *self, guint interval); G_END_DECLS - -#endif /* __FU_DEVICE_H */ - diff --git a/src/fu-engine.h b/src/fu-engine.h index 3a10b789c..266cb5950 100644 --- a/src/fu-engine.h +++ b/src/fu-engine.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_ENGINE_H -#define __FU_ENGINE_H +#pragma once G_BEGIN_DECLS @@ -131,6 +130,3 @@ XbNode *fu_engine_get_component_by_guids (FuEngine *self, FuDevice *device); G_END_DECLS - -#endif /* __FU_ENGINE_H */ - diff --git a/src/fu-hash.py b/src/fu-hash.py index 11cb1d731..13b20fc6f 100644 --- a/src/fu-hash.py +++ b/src/fu-hash.py @@ -28,6 +28,5 @@ if __name__ == '__main__': buf = f.read() csum = hashlib.sha256(buf).hexdigest() with open(sys.argv[2], 'w') as f2: - f2.write('#ifndef FU_BUILD_HASH\n') + f2.write('#pragma once\n') f2.write('#define FU_BUILD_HASH "%s"\n' % csum) - f2.write('#endif /* FU_BUILD_HASH */\n') diff --git a/src/fu-history.h b/src/fu-history.h index 0607ccdad..f9f360c0f 100644 --- a/src/fu-history.h +++ b/src/fu-history.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_HISTORY_H -#define __FU_HISTORY_H +#pragma once #include @@ -58,6 +57,3 @@ GPtrArray *fu_history_get_devices (FuHistory *self, GError **error); G_END_DECLS - -#endif /* __FU_HISTORY_H */ - diff --git a/src/fu-hwids.h b/src/fu-hwids.h index f824c4fb3..2c98a7678 100644 --- a/src/fu-hwids.h +++ b/src/fu-hwids.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_HWIDS_H -#define __FU_HWIDS_H +#pragma once #include @@ -49,5 +48,3 @@ gboolean fu_hwids_setup (FuHwids *self, GError **error); G_END_DECLS - -#endif /* __FU_HWIDS_H */ diff --git a/src/fu-idle.h b/src/fu-idle.h index f5e4d0eb6..6b9ab9b34 100644 --- a/src/fu-idle.h +++ b/src/fu-idle.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_IDLE_H -#define __FU_IDLE_H +#pragma once G_BEGIN_DECLS @@ -39,6 +38,3 @@ void fu_idle_locker_free (FuIdleLocker *locker); G_DEFINE_AUTOPTR_CLEANUP_FUNC(FuIdleLocker, fu_idle_locker_free) G_END_DECLS - -#endif /* __FU_IDLE_H */ - diff --git a/src/fu-install-task.h b/src/fu-install-task.h index c57178a3d..5fced4f1d 100644 --- a/src/fu-install-task.h +++ b/src/fu-install-task.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_INSTALL_TASK_H -#define __FU_INSTALL_TASK_H +#pragma once #include #include @@ -31,6 +30,3 @@ gint fu_install_task_compare (FuInstallTask *task1, FuInstallTask *task2); G_END_DECLS - -#endif /* __FU_INSTALL_TASK_H */ - diff --git a/src/fu-io-channel.h b/src/fu-io-channel.h index c8a7d0daa..7c5122b47 100644 --- a/src/fu-io-channel.h +++ b/src/fu-io-channel.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_IO_CHANNEL_H -#define __FU_IO_CHANNEL_H +#pragma once #include @@ -65,5 +64,3 @@ GBytes *fu_io_channel_read_bytes (FuIOChannel *self, GError **error); G_END_DECLS - -#endif /* __FU_IO_CHANNEL_H */ diff --git a/src/fu-keyring-gpg.h b/src/fu-keyring-gpg.h index 3f73e438b..b3857525d 100644 --- a/src/fu-keyring-gpg.h +++ b/src/fu-keyring-gpg.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_KEYRING_GPG_H -#define __FU_KEYRING_GPG_H +#pragma once #include "fu-keyring.h" @@ -18,5 +17,3 @@ G_DECLARE_FINAL_TYPE (FuKeyringGpg, fu_keyring_gpg, FU, KEYRING_GPG, FuKeyring) FuKeyring *fu_keyring_gpg_new (void); G_END_DECLS - -#endif /* __FU_KEYRING_GPG_H */ diff --git a/src/fu-keyring-pkcs7.h b/src/fu-keyring-pkcs7.h index 3596dee85..19b6cd2ff 100644 --- a/src/fu-keyring-pkcs7.h +++ b/src/fu-keyring-pkcs7.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_KEYRING_PKCS7_H -#define __FU_KEYRING_PKCS7_H +#pragma once #include "fu-keyring.h" @@ -18,5 +17,3 @@ G_DECLARE_FINAL_TYPE (FuKeyringPkcs7, fu_keyring_pkcs7, FU, KEYRING_PKCS7, FuKey FuKeyring *fu_keyring_pkcs7_new (void); G_END_DECLS - -#endif /* __FU_KEYRING_PKCS7_H */ diff --git a/src/fu-keyring-result.h b/src/fu-keyring-result.h index 2e823493b..2216fad10 100644 --- a/src/fu-keyring-result.h +++ b/src/fu-keyring-result.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_KEYRING_RESULT_H -#define __FU_KEYRING_RESULT_H +#pragma once #include @@ -19,5 +18,3 @@ gint64 fu_keyring_result_get_timestamp (FuKeyringResult *self); const gchar *fu_keyring_result_get_authority (FuKeyringResult *self); G_END_DECLS - -#endif /* __FU_KEYRING_RESULT_H */ diff --git a/src/fu-keyring-utils.h b/src/fu-keyring-utils.h index 43551b010..0732260dd 100644 --- a/src/fu-keyring-utils.h +++ b/src/fu-keyring-utils.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_KEYRING_UTILS_H__ -#define __FU_KEYRING_UTILS_H__ +#pragma once #include @@ -17,5 +16,3 @@ FuKeyring *fu_keyring_create_for_kind (FwupdKeyringKind kind, gboolean fu_keyring_get_release_trust_flags (XbNode *release, FwupdTrustFlags *trust_flags, GError **error); - -#endif /* __FU_KEYRING_UTILS_H__ */ diff --git a/src/fu-keyring.h b/src/fu-keyring.h index 6e03694c9..41fddeb75 100644 --- a/src/fu-keyring.h +++ b/src/fu-keyring.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_KEYRING_H -#define __FU_KEYRING_H +#pragma once #include #include @@ -45,5 +44,3 @@ void fu_keyring_set_name (FuKeyring *self, const gchar *name); G_END_DECLS - -#endif /* __FU_KEYRING_H */ diff --git a/src/fu-mutex.h b/src/fu-mutex.h index 7142acdb6..074c2784d 100644 --- a/src/fu-mutex.h +++ b/src/fu-mutex.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_MUTEX_H -#define __FU_MUTEX_H +#pragma once #include @@ -64,5 +63,3 @@ void fu_mutex_locker_free (FuMutexLocker *locker); G_DEFINE_AUTOPTR_CLEANUP_FUNC(FuMutexLocker, fu_mutex_locker_free) G_END_DECLS - -#endif /* __FU_MUTEX_H */ diff --git a/src/fu-plugin-list.h b/src/fu-plugin-list.h index f0ee6b3be..b894cb83a 100644 --- a/src/fu-plugin-list.h +++ b/src/fu-plugin-list.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_PLUGIN_LIST_H -#define __FU_PLUGIN_LIST_H +#pragma once G_BEGIN_DECLS @@ -27,6 +26,3 @@ gboolean fu_plugin_list_depsolve (FuPluginList *self, GError **error); G_END_DECLS - -#endif /* __FU_PLUGIN_LIST_H */ - diff --git a/src/fu-plugin-private.h b/src/fu-plugin-private.h index 6ffefb74f..d89d63840 100644 --- a/src/fu-plugin-private.h +++ b/src/fu-plugin-private.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_PLUGIN_PRIVATE_H -#define __FU_PLUGIN_PRIVATE_H +#pragma once #include "fu-quirks.h" #include "fu-plugin.h" @@ -122,5 +121,3 @@ gint fu_plugin_order_compare (FuPlugin *plugin1, gchar *fu_plugin_guess_name_from_fn (const gchar *filename); G_END_DECLS - -#endif /* __FU_PLUGIN_PRIVATE_H */ diff --git a/src/fu-plugin-vfuncs.h b/src/fu-plugin-vfuncs.h index 63289355f..42667a939 100644 --- a/src/fu-plugin-vfuncs.h +++ b/src/fu-plugin-vfuncs.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_PLUGIN_VFUNCS_H -#define __FU_PLUGIN_VFUNCS_H +#pragma once #include "fu-plugin.h" #include "fu-device.h" @@ -79,5 +78,3 @@ void fu_plugin_device_registered (FuPlugin *plugin, FuDevice *dev); G_END_DECLS - -#endif /* __FU_PLUGIN_VFUNCS_H */ diff --git a/src/fu-plugin.h b/src/fu-plugin.h index a2f157682..edf6633f5 100644 --- a/src/fu-plugin.h +++ b/src/fu-plugin.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_PLUGIN_H -#define __FU_PLUGIN_H +#pragma once #include #include @@ -154,6 +153,3 @@ void fu_plugin_add_compile_version (FuPlugin *self, const gchar *version); G_END_DECLS - -#endif /* __FU_PLUGIN_H */ - diff --git a/src/fu-progressbar.h b/src/fu-progressbar.h index 589b9f58b..3f2bbc6f6 100644 --- a/src/fu-progressbar.h +++ b/src/fu-progressbar.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_PROGRESSBAR_H -#define __FU_PROGRESSBAR_H +#pragma once #include @@ -30,6 +29,3 @@ void fu_progressbar_set_interactive (FuProgressbar *self, gboolean interactive); G_END_DECLS - -#endif /* __FU_PROGRESSBAR_H */ - diff --git a/src/fu-quirks.h b/src/fu-quirks.h index 41a7f7a18..9d01383ba 100644 --- a/src/fu-quirks.h +++ b/src/fu-quirks.h @@ -5,8 +5,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_QUIRKS_H -#define __FU_QUIRKS_H +#pragma once G_BEGIN_DECLS @@ -49,5 +48,3 @@ gboolean fu_quirks_get_kvs_for_guid (FuQuirks *self, #define FU_QUIRKS_VERSION_FORMAT "VersionFormat" G_END_DECLS - -#endif /* __FU_QUIRKS_H */ diff --git a/src/fu-smbios.h b/src/fu-smbios.h index 6c4d7c76a..b6696e2dd 100644 --- a/src/fu-smbios.h +++ b/src/fu-smbios.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_SMBIOS_H -#define __FU_SMBIOS_H +#pragma once #include @@ -41,5 +40,3 @@ GBytes *fu_smbios_get_data (FuSmbios *self, GError **error); G_END_DECLS - -#endif /* __FU_SMBIOS_H */ diff --git a/src/fu-test.h b/src/fu-test.h index 67b5ec42a..d12fce7fa 100644 --- a/src/fu-test.h +++ b/src/fu-test.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_TEST_H__ -#define __FU_TEST_H__ +#pragma once #include @@ -16,5 +15,3 @@ void fu_test_loop_quit (void); gboolean fu_test_compare_lines (const gchar *txt1, const gchar *txt2, GError **error); - -#endif /* __FU_TEST_H__ */ diff --git a/src/fu-udev-device-private.h b/src/fu-udev-device-private.h index 32be9f291..b06a52bb7 100644 --- a/src/fu-udev-device-private.h +++ b/src/fu-udev-device-private.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UDEV_DEVICE_PRIVATE_H -#define __FU_UDEV_DEVICE_PRIVATE_H +#pragma once #include "fu-udev-device.h" @@ -14,5 +13,3 @@ G_BEGIN_DECLS void fu_udev_device_emit_changed (FuUdevDevice *self); G_END_DECLS - -#endif /* __FU_UDEV_DEVICE_PRIVATE_H */ diff --git a/src/fu-udev-device.h b/src/fu-udev-device.h index efb76b9f9..d8813dfae 100644 --- a/src/fu-udev-device.h +++ b/src/fu-udev-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UDEV_DEVICE_H -#define __FU_UDEV_DEVICE_H +#pragma once #include #include @@ -40,5 +39,3 @@ gboolean fu_udev_device_set_physical_id (FuUdevDevice *self, void fu_udev_device_dump (FuUdevDevice *self); G_END_DECLS - -#endif /* __FU_UDEV_DEVICE_H */ diff --git a/src/fu-usb-device-private.h b/src/fu-usb-device-private.h index 443a89c59..9886ff618 100644 --- a/src/fu-usb-device-private.h +++ b/src/fu-usb-device-private.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_USB_DEVICE_PRIVATE_H -#define __FU_USB_DEVICE_PRIVATE_H +#pragma once #include "fu-usb-device.h" @@ -14,5 +13,3 @@ G_BEGIN_DECLS const gchar *fu_usb_device_get_platform_id (FuUsbDevice *self); G_END_DECLS - -#endif /* __FU_USB_DEVICE_PRIVATE_H */ diff --git a/src/fu-usb-device.h b/src/fu-usb-device.h index cbd8fafe9..e92f55118 100644 --- a/src/fu-usb-device.h +++ b/src/fu-usb-device.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_USB_DEVICE_H -#define __FU_USB_DEVICE_H +#pragma once #include #include @@ -48,5 +47,3 @@ void fu_usb_device_set_dev (FuUsbDevice *device, gboolean fu_usb_device_is_open (FuUsbDevice *device); G_END_DECLS - -#endif /* __FU_USB_DEVICE_H */ diff --git a/src/fu-util-common.h b/src/fu-util-common.h index d099ec409..896342517 100644 --- a/src/fu-util-common.h +++ b/src/fu-util-common.h @@ -4,8 +4,7 @@ * SPDX-License-Identifier: LGPL-2.1+ */ -#ifndef __FU_UTIL_COMMON_H__ -#define __FU_UTIL_COMMON_H__ +#pragma once #include #include @@ -27,5 +26,3 @@ gchar *fu_util_get_versions (void); gboolean fu_util_prompt_complete (FwupdDeviceFlags flags, gboolean prompt, GError **error); - -#endif /* __FU_UTIL_COMMON_H__ */