[vlc-devel] [PATCH 18/28] modules/control/dbus: fixed include-guards

[Filip Roséen]

  * renamed include-guards to fix issues with reserved identifiers
  * replaced comments at `#endif` corresponding to include-guards
---
 modules/control/dbus/dbus_common.h     | 6 +++---
 modules/control/dbus/dbus_introspect.h | 6 +++---
 modules/control/dbus/dbus_player.h     | 6 +++---
 modules/control/dbus/dbus_root.h       | 6 +++---
 modules/control/dbus/dbus_tracklist.h  | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/control/dbus/dbus_common.h b/modules/control/dbus/dbus_common.h
index 9579c3f..b1561e8 100644
--- a/modules/control/dbus/dbus_common.h
+++ b/modules/control/dbus/dbus_common.h
@@ -26,8 +26,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_DBUS_COMMON_H
-#define _VLC_DBUS_COMMON_H
+#ifndef CONTROL__DBUS__DBUS_COMMON_H_
+#define CONTROL__DBUS__DBUS_COMMON_H_
 
 #include <vlc_common.h>
 #include <vlc_interface.h>
@@ -146,4 +146,4 @@ int AddProperty ( intf_thread_t *p_intf,
                   const char* psz_signature,
                   int (*pf_marshaller) (intf_thread_t*, DBusMessageIter*) );
 
-#endif //dbus-common.h
+#endif /* include-guard */
diff --git a/modules/control/dbus/dbus_introspect.h b/modules/control/dbus/dbus_introspect.h
index cb570e7..6e26857 100644
--- a/modules/control/dbus/dbus_introspect.h
+++ b/modules/control/dbus/dbus_introspect.h
@@ -26,8 +26,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_DBUS_INTROSPECT_H
-#define _VLC_DBUS_INTROSPECT_H
+#ifndef CONTROL__DBUS__DBUS_INTROSPECT_H_
+#define CONTROL__DBUS__DBUS_INTROSPECT_H_
 
 #include "dbus_common.h"
 
@@ -153,4 +153,4 @@ DBUS_METHOD( handle_introspect )
     REPLY_SEND;
 }
 
-#endif //dbus-introspect.h
+#endif /* include-guard */
diff --git a/modules/control/dbus/dbus_player.h b/modules/control/dbus/dbus_player.h
index 56c0de3..68f2e52 100644
--- a/modules/control/dbus/dbus_player.h
+++ b/modules/control/dbus/dbus_player.h
@@ -24,8 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_DBUS_PLAYER_H
-#define _VLC_DBUS_PLAYER_H
+#ifndef CONTROL__DBUS__DBUS_PLAYER_H_
+#define CONTROL__DBUS__DBUS_PLAYER_H_
 
 #include <vlc_interface.h>
 #include "dbus_common.h"
@@ -73,4 +73,4 @@ int PlayerPropertiesChangedEmit( intf_thread_t *, vlc_dictionary_t * );
 
 void UpdatePlayerCaps( intf_thread_t * );
 
-#endif //dbus_player.h
+#endif /* include-guard */
diff --git a/modules/control/dbus/dbus_root.h b/modules/control/dbus/dbus_root.h
index f95022b..b3b052b 100644
--- a/modules/control/dbus/dbus_root.h
+++ b/modules/control/dbus/dbus_root.h
@@ -24,8 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_DBUS_ROOT_H
-#define _VLC_DBUS_ROOT_H
+#ifndef CONTROL__DBUS__DBUS_ROOT_H_
+#define CONTROL__DBUS__DBUS_ROOT_H_
 
 #include "dbus_common.h"
 
@@ -39,4 +39,4 @@ DBusHandlerResult handle_root ( DBusConnection *p_conn,
 int RootPropertiesChangedEmit ( intf_thread_t *,
                                 vlc_dictionary_t * );
 
-#endif //dbus-root.h
+#endif /* include-guard */
diff --git a/modules/control/dbus/dbus_tracklist.h b/modules/control/dbus/dbus_tracklist.h
index 242416d..39fadca 100644
--- a/modules/control/dbus/dbus_tracklist.h
+++ b/modules/control/dbus/dbus_tracklist.h
@@ -24,8 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_DBUS_TRACKLIST_H
-#define _VLC_DBUS_TRACKLIST_H
+#ifndef CONTROL__DBUS__DBUS_TRACLIST_H_
+#define CONTROL__DBUS__DBUS_TRACLIST_H_
 
 #include <vlc_common.h>
 #include <vlc_interface.h>
@@ -44,4 +44,4 @@ DBusHandlerResult handle_tracklist ( DBusConnection *p_conn,
 
 int TrackListPropertiesChangedEmit( intf_thread_t *, vlc_dictionary_t * );
 
-#endif //dbus_tracklist.h
+#endif /* include-guard */
-- 
2.7.1