[libmanette] Use #pragma once
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libmanette] Use #pragma once
- Date: Mon, 23 Nov 2020 18:58:10 +0000 (UTC)
commit fcf2fd4f552645220bfa86a9b8fb1c373185e6ba
Author: Adrien Plazas <kekun plazas laposte net>
Date: Mon Nov 23 19:45:22 2020 +0100
Use #pragma once
Fixes https://gitlab.gnome.org/GNOME/libmanette/-/issues/23
src/libmanette.h | 5 +----
src/manette-device-private.h | 5 +----
src/manette-device.h | 5 +----
src/manette-event-mapping-private.h | 5 +----
src/manette-event-private.h | 5 +----
src/manette-event.h | 5 +----
src/manette-mapping-error-private.h | 5 +----
src/manette-mapping-manager-private.h | 5 +----
src/manette-mapping-private.h | 6 +-----
src/manette-monitor-iter-private.h | 5 +----
src/manette-monitor-iter.h | 5 +----
src/manette-monitor.h | 5 +----
src/manette-version.h.in | 5 +----
13 files changed, 13 insertions(+), 53 deletions(-)
---
diff --git a/src/libmanette.h b/src/libmanette.h
index 77e4ddc..9b3daee 100644
--- a/src/libmanette.h
+++ b/src/libmanette.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef LIBMANETTE_H
-#define LIBMANETTE_H
+#pragma once
#include <glib.h>
@@ -32,5 +31,3 @@ G_BEGIN_DECLS
#undef __MANETTE_INSIDE__
G_END_DECLS
-
-#endif /* LIBMANETTE_H */
diff --git a/src/manette-device-private.h b/src/manette-device-private.h
index a2d2887..ff66bf4 100644
--- a/src/manette-device-private.h
+++ b/src/manette-device-private.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MANETTE_DEVICE_PRIVATE_H
-#define MANETTE_DEVICE_PRIVATE_H
+#pragma once
#if !defined(MANETTE_COMPILATION)
# error "This file is private, only <libmanette.h> can be included directly."
@@ -39,5 +38,3 @@ void manette_device_set_mapping (ManetteDevice *self,
ManetteMapping *mapping);
G_END_DECLS
-
-#endif /* MANETTE_DEVICE_PRIVATE_H */
diff --git a/src/manette-device.h b/src/manette-device.h
index 5ebe383..207a0d4 100644
--- a/src/manette-device.h
+++ b/src/manette-device.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MANETTE_DEVICE_H
-#define MANETTE_DEVICE_H
+#pragma once
#if !defined(__MANETTE_INSIDE__) && !defined(MANETTE_COMPILATION)
# error "Only <libmanette.h> can be included directly."
@@ -46,5 +45,3 @@ gboolean manette_device_rumble (ManetteDevice *self,
guint16 milliseconds);
G_END_DECLS
-
-#endif /* MANETTE_DEVICE_H */
diff --git a/src/manette-event-mapping-private.h b/src/manette-event-mapping-private.h
index 15873f8..60b91a2 100644
--- a/src/manette-event-mapping-private.h
+++ b/src/manette-event-mapping-private.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MANETTE_EVENT_MAPPING_PRIVATE_H
-#define MANETTE_EVENT_MAPPING_PRIVATE_H
+#pragma once
#if !defined(MANETTE_COMPILATION)
# error "This file is private, only <libmanette.h> can be included directly."
@@ -32,5 +31,3 @@ GSList *manette_map_event (ManetteMapping *mapping,
ManetteEvent *event);
G_END_DECLS
-
-#endif /* MANETTE_EVENT_MAPPING_PRIVATE_H */
diff --git a/src/manette-event-private.h b/src/manette-event-private.h
index 6e80642..a1a00d8 100644
--- a/src/manette-event-private.h
+++ b/src/manette-event-private.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MANETTE_EVENT_PRIVATE_H
-#define MANETTE_EVENT_PRIVATE_H
+#pragma once
#if !defined(MANETTE_COMPILATION)
# error "This file is private, only <libmanette.h> can be included directly."
@@ -85,5 +84,3 @@ union _ManetteEvent {
};
G_END_DECLS
-
-#endif /* MANETTE_EVENT_PRIVATE_H */
diff --git a/src/manette-event.h b/src/manette-event.h
index 8d8ce3e..0e14d92 100644
--- a/src/manette-event.h
+++ b/src/manette-event.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MANETTE_EVENT_H
-#define MANETTE_EVENT_H
+#pragma once
#if !defined(__MANETTE_INSIDE__) && !defined(MANETTE_COMPILATION)
# error "Only <libmanette.h> can be included directly."
@@ -78,5 +77,3 @@ gboolean manette_event_get_hat (const ManetteEvent *self,
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ManetteEvent, manette_event_free)
G_END_DECLS
-
-#endif /* MANETTE_EVENT_H */
diff --git a/src/manette-mapping-error-private.h b/src/manette-mapping-error-private.h
index b028dfc..deeed3c 100644
--- a/src/manette-mapping-error-private.h
+++ b/src/manette-mapping-error-private.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MANETTE_MAPPING_ERROR_H
-#define MANETTE_MAPPING_ERROR_H
+#pragma once
#if !defined(__MANETTE_INSIDE__) && !defined(MANETTE_COMPILATION)
# error "Only <libmanette.h> can be included directly."
@@ -37,5 +36,3 @@ typedef enum
GQuark manette_mapping_error_quark (void);
G_END_DECLS
-
-#endif /* MANETTE_MAPPING_ERROR_H */
diff --git a/src/manette-mapping-manager-private.h b/src/manette-mapping-manager-private.h
index 797fdaf..d5f3535 100644
--- a/src/manette-mapping-manager-private.h
+++ b/src/manette-mapping-manager-private.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MANETTE_MAPPING_MANAGER_H
-#define MANETTE_MAPPING_MANAGER_H
+#pragma once
#if !defined(__MANETTE_INSIDE__) && !defined(MANETTE_COMPILATION)
# error "Only <libmanette.h> can be included directly."
@@ -48,5 +47,3 @@ void manette_mapping_manager_delete_mapping (ManetteMappingManager *self,
const gchar *guid);
G_END_DECLS
-
-#endif /* MANETTE_MAPPING_MANAGER_H */
diff --git a/src/manette-mapping-private.h b/src/manette-mapping-private.h
index 2934ee4..886d67d 100644
--- a/src/manette-mapping-private.h
+++ b/src/manette-mapping-private.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MANETTE_MAPPING_H
-#define MANETTE_MAPPING_H
+#pragma once
#if !defined(__MANETTE_INSIDE__) && !defined(MANETTE_COMPILATION)
# error "Only <libmanette.h> can be included directly."
@@ -73,6 +72,3 @@ gboolean manette_mapping_has_destination_input (ManetteMapping *self,
guint code);
G_END_DECLS
-
-#endif /* MANETTE_MAPPING_H */
-
diff --git a/src/manette-monitor-iter-private.h b/src/manette-monitor-iter-private.h
index 539592c..8f3ee84 100644
--- a/src/manette-monitor-iter-private.h
+++ b/src/manette-monitor-iter-private.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MANETTE_MONITOR_ITER_PRIVATE_H
-#define MANETTE_MONITOR_ITER_PRIVATE_H
+#pragma once
#if !defined(MANETTE_COMPILATION)
# error "This file is private, only <libmanette.h> can be included directly."
@@ -31,5 +30,3 @@ ManetteMonitorIter *manette_monitor_iter_new (GHashTable *devices);
ManetteMonitorIter *manette_monitor_iter_copy (ManetteMonitorIter *self);
G_END_DECLS
-
-#endif /* MANETTE_MONITOR_ITER_PRIVATE_H */
diff --git a/src/manette-monitor-iter.h b/src/manette-monitor-iter.h
index d7b283d..f560709 100644
--- a/src/manette-monitor-iter.h
+++ b/src/manette-monitor-iter.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MANETTE_MONITOR_ITER_H
-#define MANETTE_MONITOR_ITER_H
+#pragma once
#if !defined(__MANETTE_INSIDE__) && !defined(MANETTE_COMPILATION)
# error "Only <libmanette.h> can be included directly."
@@ -41,5 +40,3 @@ void manette_monitor_iter_free (ManetteMonitorIter *self);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ManetteMonitorIter, manette_monitor_iter_free)
G_END_DECLS
-
-#endif /* MANETTE_MONITOR_ITER_H */
diff --git a/src/manette-monitor.h b/src/manette-monitor.h
index b87b86a..4437eaf 100644
--- a/src/manette-monitor.h
+++ b/src/manette-monitor.h
@@ -16,8 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MANETTE_MONITOR_H
-#define MANETTE_MONITOR_H
+#pragma once
#if !defined(__MANETTE_INSIDE__) && !defined(MANETTE_COMPILATION)
# error "Only <libmanette.h> can be included directly."
@@ -37,5 +36,3 @@ ManetteMonitor *manette_monitor_new (void);
ManetteMonitorIter *manette_monitor_iterate (ManetteMonitor *self);
G_END_DECLS
-
-#endif /* MANETTE_MONITOR_H */
diff --git a/src/manette-version.h.in b/src/manette-version.h.in
index 421ee42..829c8fb 100644
--- a/src/manette-version.h.in
+++ b/src/manette-version.h.in
@@ -25,8 +25,7 @@
* at compile-time.
*/
-#ifndef LIBMANETTE_VERSION_H
-#define LIBMANETTE_VERSION_H
+#pragma once
#if !defined(__MANETTE_INSIDE__) && !defined(MANETTE_COMPILATION)
# error "Only <libmanette.h> can be included directly."
@@ -94,5 +93,3 @@
(LIBMANETTE_MAJOR_VERSION == (major) && LIBMANETTE_MINOR_VERSION > (minor)) || \
(LIBMANETTE_MAJOR_VERSION == (major) && LIBMANETTE_MINOR_VERSION == (minor) && \
LIBMANETTE_MICRO_VERSION >= (micro)))
-
-#endif /* LIBMANETTE_VERSION_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]