From 3d1195ca6a380e5af16e3a505a007369cf18a4db Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 8 Jun 2011 11:55:45 +0100
Subject: Fix some include guards in Android files

This will become relevant after we merge beyond
http://trac.webkit.org/changeset/81977 (and its follow-up build fixes
r81982, r81988, r81990, r82018) which relies on all platforms'
instances of FontPlatformData.h using the correct include guard.

Change-Id: I58ec4c8ee23698c41d86794333d603b95f303764
---
 Source/WebKit/android/wds/Command.h              | 4 ++--
 Source/WebKit/android/wds/Connection.h           | 4 ++--
 Source/WebKit/android/wds/DebugServer.h          | 4 ++--
 Source/WebKit/android/wds/client/AdbConnection.h | 4 ++--
 Source/WebKit/android/wds/client/ClientUtils.h   | 4 ++--
 Source/WebKit/android/wds/client/Device.h        | 4 ++--
 Source/WebKit/android/wds/client/DeviceList.h    | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'Source/WebKit/android/wds')

diff --git a/Source/WebKit/android/wds/Command.h b/Source/WebKit/android/wds/Command.h
index 90861d4..f70559f 100644
--- a/Source/WebKit/android/wds/Command.h
+++ b/Source/WebKit/android/wds/Command.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WDS_COMMAND_H
-#define WDS_COMMAND_H
+#ifndef Command_h
+#define Command_h
 
 #include "wtf/MainThread.h"
 #include "wtf/Vector.h"
diff --git a/Source/WebKit/android/wds/Connection.h b/Source/WebKit/android/wds/Connection.h
index d67179e..2519337 100644
--- a/Source/WebKit/android/wds/Connection.h
+++ b/Source/WebKit/android/wds/Connection.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WDS_CONNECTION_H
-#define WDS_CONNECTION_H
+#ifndef Connection_h
+#define Connection_h
 
 #include <unistd.h>
 #include <sys/socket.h>
diff --git a/Source/WebKit/android/wds/DebugServer.h b/Source/WebKit/android/wds/DebugServer.h
index 3d7a539..693d11a 100644
--- a/Source/WebKit/android/wds/DebugServer.h
+++ b/Source/WebKit/android/wds/DebugServer.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef DEBUGSERVER_H
-#define DEBUGSERVER_H
+#ifndef DebugServer_h
+#define DebugServer_h
 
 // Turn on the wds feature in webkit
 #define ENABLE_WDS 0
diff --git a/Source/WebKit/android/wds/client/AdbConnection.h b/Source/WebKit/android/wds/client/AdbConnection.h
index 58bad67..93e5cda 100644
--- a/Source/WebKit/android/wds/client/AdbConnection.h
+++ b/Source/WebKit/android/wds/client/AdbConnection.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WDS_ADB_CONNECTION_H
-#define WDS_ADB_CONNECTION_H
+#ifndef AdbConnection_h
+#define AdbConnection_h
 
 #include "DeviceList.h"
 
diff --git a/Source/WebKit/android/wds/client/ClientUtils.h b/Source/WebKit/android/wds/client/ClientUtils.h
index 5da1624..7d0db30 100644
--- a/Source/WebKit/android/wds/client/ClientUtils.h
+++ b/Source/WebKit/android/wds/client/ClientUtils.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WDS_CLIENT_UTILS_H
-#define WDS_CLIENT_UTILS_H
+#ifndef ClientUtils_h
+#define ClientUtils_h
 
 #include <arpa/inet.h>
 
diff --git a/Source/WebKit/android/wds/client/Device.h b/Source/WebKit/android/wds/client/Device.h
index 39d4b12..101e2c3 100644
--- a/Source/WebKit/android/wds/client/Device.h
+++ b/Source/WebKit/android/wds/client/Device.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WDS_DEVICE_H
-#define WDS_DEVICE_H
+#ifndef Device_h
+#define Device_h
 
 #include <stdlib.h>
 
diff --git a/Source/WebKit/android/wds/client/DeviceList.h b/Source/WebKit/android/wds/client/DeviceList.h
index 45bfb87..6e2691e 100644
--- a/Source/WebKit/android/wds/client/DeviceList.h
+++ b/Source/WebKit/android/wds/client/DeviceList.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WDS_DEVICE_LIST_H
-#define WDS_DEVICE_LIST_H
+#ifndef DeviceList_h
+#define DeviceList_h
 
 #include <utils/Vector.h>
 
-- 
cgit v1.1