From 49fccfefc8f2cbf3444d71b77c0e3fcc935c020e Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Fri, 29 Jan 2010 16:00:10 +0100
Subject: [PATCH] Clean up and standardize header guards

---
 spice/barrier.h     | 2 +-
 spice/draw.h        | 6 +++---
 spice/error_codes.h | 6 +++---
 spice/ipc_ring.h    | 6 +++---
 spice/protocol.h    | 7 +++----
 spice/qxl_dev.h     | 2 +-
 spice/stats.h       | 7 +++----
 spice/types.h       | 2 +-
 spice/vd_agent.h    | 4 +---
 spice/vdi_dev.h     | 2 +-
 10 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/spice/barrier.h b/spice/barrier.h
index c3caf1b..8c81c86 100644
--- a/spice/barrier.h
+++ b/spice/barrier.h
@@ -43,4 +43,4 @@
 #define spice_mb() __asm {lock add [esp], 0}
 #endif
 
-#endif _H_SPICE_BARRIER
+#endif /* _H_SPICE_BARRIER */
diff --git a/spice/draw.h b/spice/draw.h
index 4e99456..254e0b0 100644
--- a/spice/draw.h
+++ b/spice/draw.h
@@ -28,8 +28,8 @@
    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef _H_DRAW
-#define _H_DRAW
+#ifndef _H_SPICE_DRAW
+#define _H_SPICE_DRAW
 
 #include <spice/types.h>
 
@@ -370,4 +370,4 @@ typedef struct SPICE_ATTR_PACKED SpiceCursorHeader {
 
 #include <spice/end-packed.h>
 
-#endif
+#endif /* _H_SPICE_DRAW */
diff --git a/spice/error_codes.h b/spice/error_codes.h
index bff53dd..9fcfe3f 100644
--- a/spice/error_codes.h
+++ b/spice/error_codes.h
@@ -28,8 +28,8 @@
    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef RED_ERROR_CODES_H
-#define RED_ERROR_CODES_H
+#ifndef _H_SPICE_ERROR_CODES
+#define _H_SPICE_ERROR_CODES
 
 #define SPICEC_ERROR_CODE_SUCCESS 0
 #define SPICEC_ERROR_CODE_ERROR 1
@@ -47,5 +47,5 @@
 #define SPICEC_ERROR_CODE_INVALID_ARG 13
 #define SPICEC_ERROR_CODE_CMD_LINE_ERROR 14
 
-#endif
+#endif /* _H_SPICE_ERROR_CODES */
 
diff --git a/spice/ipc_ring.h b/spice/ipc_ring.h
index 2de6470..52c456f 100644
--- a/spice/ipc_ring.h
+++ b/spice/ipc_ring.h
@@ -29,8 +29,8 @@
 */
 
 
-#ifndef _H_RING_
-#define _H_RING_
+#ifndef _H_SPICE_RING
+#define _H_SPICE_RING
 
 #include <spice/types.h>
 
@@ -133,4 +133,4 @@ typedef struct SPICE_ATTR_PACKED name {                   \
 
 
 
-#endif
+#endif /* _H_SPICE_RING */
diff --git a/spice/protocol.h b/spice/protocol.h
index 17ea953..bbb9073 100644
--- a/spice/protocol.h
+++ b/spice/protocol.h
@@ -28,8 +28,8 @@
    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef _H_RED
-#define _H_RED
+#ifndef _H_SPICE_PROTOCOL
+#define _H_SPICE_PROTOCOL
 
 #include <spice/types.h>
 
@@ -825,5 +825,4 @@ typedef struct SPICE_ATTR_PACKED SpiceMsgcTunnelSocketTokens {
 
 #include <spice/end-packed.h>
 
-#endif
-
+#endif /* _H_SPICE_PROTOCOL */
diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h
index 6b4fc11..8c541fd 100644
--- a/spice/qxl_dev.h
+++ b/spice/qxl_dev.h
@@ -355,4 +355,4 @@ typedef struct SPICE_ATTR_PACKED QXLImage {
 
 #include <spice/end-packed.h>
 
-#endif
+#endif /* _H_QXL_DEV */
diff --git a/spice/stats.h b/spice/stats.h
index 77733a8..eea5478 100644
--- a/spice/stats.h
+++ b/spice/stats.h
@@ -28,8 +28,8 @@
    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef _H_REDS_STAT
-#define _H_REDS_STAT
+#ifndef _H_SPICE_STATS
+#define _H_SPICE_STATS
 
 #include <spice/types.h>
 
@@ -64,5 +64,4 @@ typedef struct SpiceStat {
     SpiceStatNode nodes[];
 } SpiceStat;
 
-#endif
-
+#endif /* _H_SPICE_STATS */
diff --git a/spice/types.h b/spice/types.h
index 891cc80..c6c4d03 100644
--- a/spice/types.h
+++ b/spice/types.h
@@ -37,4 +37,4 @@
  * include the right one here. */
 #include <stdint.h>
 
-#endif _H_SPICE_TYPES
+#endif /* _H_SPICE_TYPES */
diff --git a/spice/vd_agent.h b/spice/vd_agent.h
index fadc575..b0c496c 100644
--- a/spice/vd_agent.h
+++ b/spice/vd_agent.h
@@ -94,6 +94,4 @@ enum {
 
 #include <spice/end-packed.h>
 
-#endif
-
-
+#endif /* _H_VD_AGENT */
diff --git a/spice/vdi_dev.h b/spice/vdi_dev.h
index 247178f..b47b613 100644
--- a/spice/vdi_dev.h
+++ b/spice/vdi_dev.h
@@ -80,4 +80,4 @@ typedef struct SPICE_ATTR_PACKED VDIPortRam {
 
 #include <spice/end-packed.h>
 
-#endif
+#endif /* _H_VDI_DEV */