From c2f1db8f83618e60dcded8303d14656d7d26b436 Mon Sep 17 00:00:00 2001
From: Shawn Landden <shawnlandden@gmail.com>
Date: Wed, 18 Jul 2012 10:07:51 -0700
Subject: use #pragma once instead of foo*foo #define guards

 #pragma once has been "un-deprecated" in gcc since 3.3, and is widely supported
in other compilers.

I've been using and maintaining (rebasing) this patch for a while now, as
it annoyed me to see #ifndef fooblahfoo, etc all over the place,
almost arrogant about the annoyance of having to define all these names to
perform a commen but neccicary functionality, when a completely superior
alternative exists.

I havn't sent it till now, cause its kindof a style change, and it is bad
voodoo to mess with style that has been established by more established
editors. So feel free to lambast me as a crazy bafoon.

v2 - preserve externally used headers
---
 src/login/logind-acl.h     | 5 +----
 src/login/logind-device.h  | 5 +----
 src/login/logind-seat.h    | 5 +----
 src/login/logind-session.h | 5 +----
 src/login/logind-user.h    | 5 +----
 src/login/logind.h         | 5 +----
 6 files changed, 6 insertions(+), 24 deletions(-)

(limited to 'src/login')

diff --git a/src/login/logind-acl.h b/src/login/logind-acl.h
index ea34590bd1..ec09843a78 100644
--- a/src/login/logind-acl.h
+++ b/src/login/logind-acl.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foologindaclhfoo
-#define foologindaclhfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -56,5 +55,3 @@ static inline int devnode_acl_all(struct udev *udev,
 }
 
 #endif
-
-#endif
diff --git a/src/login/logind-device.h b/src/login/logind-device.h
index bdb9741727..3b153568cb 100644
--- a/src/login/logind-device.h
+++ b/src/login/logind-device.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foologinddevicehfoo
-#define foologinddevicehfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -44,5 +43,3 @@ Device* device_new(Manager *m, const char *sysfs);
 void device_free(Device *d);
 void device_attach(Device *d, Seat *s);
 void device_detach(Device *d);
-
-#endif
diff --git a/src/login/logind-seat.h b/src/login/logind-seat.h
index 1abbc344ec..c8ab17f7cf 100644
--- a/src/login/logind-seat.h
+++ b/src/login/logind-seat.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foologindseathfoo
-#define foologindseathfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -82,5 +81,3 @@ extern const DBusObjectPathVTable bus_seat_vtable;
 
 int seat_send_signal(Seat *s, bool new_seat);
 int seat_send_changed(Seat *s, const char *properties);
-
-#endif
diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index b255dc7cde..bfa4abd690 100644
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foologindsessionhfoo
-#define foologindsessionhfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -145,5 +144,3 @@ SessionClass session_class_from_string(const char *s);
 
 const char *kill_who_to_string(KillWho k);
 KillWho kill_who_from_string(const char *s);
-
-#endif
diff --git a/src/login/logind-user.h b/src/login/logind-user.h
index cffac35447..a679d43a30 100644
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foologinduserhfoo
-#define foologinduserhfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -83,5 +82,3 @@ int user_send_changed(User *u, const char *properties);
 
 const char* user_state_to_string(UserState s);
 UserState user_state_from_string(const char *s);
-
-#endif
diff --git a/src/login/logind.h b/src/login/logind.h
index 5e828bf019..24d705b541 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foologindhfoo
-#define foologindhfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -164,5 +163,3 @@ int manager_dispatch_delayed(Manager *manager);
 
 /* gperf lookup function */
 const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length);
-
-#endif
-- 
cgit v1.2.3-54-g00ecf