From deddea6549af5f9c4f700b0949c2cb6393edb1bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Mon, 21 Oct 2013 14:39:06 -0700
Subject: [PATCH] wayland: Be consistent about #include-guard names

We had a mix of inconsistent names, some of which were non-conformant.
Standardize on all-uppercase-and-underscore naming convention.

https://bugs.freedesktop.org/show_bug.cgi?id=70679
---
 cursor/xcursor.h     | 4 ++--
 src/wayland-client.h | 4 ++--
 src/wayland-egl.h    | 4 ++--
 src/wayland-server.h | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cursor/xcursor.h b/cursor/xcursor.h
index 91747d9b..f518767a 100644
--- a/cursor/xcursor.h
+++ b/cursor/xcursor.h
@@ -20,8 +20,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _XCURSOR_H_
-#define _XCURSOR_H_
+#ifndef XCURSOR_H
+#define XCURSOR_H
 
 typedef int		XcursorBool;
 typedef unsigned int	XcursorUInt;
diff --git a/src/wayland-client.h b/src/wayland-client.h
index cf921740..43ba3fc0 100644
--- a/src/wayland-client.h
+++ b/src/wayland-client.h
@@ -20,8 +20,8 @@
  * OF THIS SOFTWARE.
  */
 
-#ifndef _WAYLAND_CLIENT_H
-#define _WAYLAND_CLIENT_H
+#ifndef WAYLAND_CLIENT_H
+#define WAYLAND_CLIENT_H
 
 #include "wayland-util.h"
 #include "wayland-version.h"
diff --git a/src/wayland-egl.h b/src/wayland-egl.h
index 82551517..c40280b1 100644
--- a/src/wayland-egl.h
+++ b/src/wayland-egl.h
@@ -21,8 +21,8 @@
  * OF THIS SOFTWARE.
  */
 
-#ifndef _WAYLAND_EGL_H
-#define _WAYLAND_EGL_H
+#ifndef WAYLAND_EGL_H
+#define WAYLAND_EGL_H
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/src/wayland-server.h b/src/wayland-server.h
index c93987de..36c9a159 100644
--- a/src/wayland-server.h
+++ b/src/wayland-server.h
@@ -20,8 +20,8 @@
  * OF THIS SOFTWARE.
  */
 
-#ifndef WAYLAND_H
-#define WAYLAND_H
+#ifndef WAYLAND_SERVER_H
+#define WAYLAND_SERVER_H
 
 #ifdef  __cplusplus
 extern "C" {