summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/wds
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-06-08 11:55:45 +0100
committerSteve Block <steveblock@google.com>2011-06-08 11:55:45 +0100
commit3d1195ca6a380e5af16e3a505a007369cf18a4db (patch)
treebdbf2f48ece0b654af8c02e9bda65563a690ebb4 /Source/WebKit/android/wds
parent8dc5cf421626552644b657639d1e75549a3ff51f (diff)
downloadexternal_webkit-3d1195ca6a380e5af16e3a505a007369cf18a4db.zip
external_webkit-3d1195ca6a380e5af16e3a505a007369cf18a4db.tar.gz
external_webkit-3d1195ca6a380e5af16e3a505a007369cf18a4db.tar.bz2
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
Diffstat (limited to 'Source/WebKit/android/wds')
-rw-r--r--Source/WebKit/android/wds/Command.h4
-rw-r--r--Source/WebKit/android/wds/Connection.h4
-rw-r--r--Source/WebKit/android/wds/DebugServer.h4
-rw-r--r--Source/WebKit/android/wds/client/AdbConnection.h4
-rw-r--r--Source/WebKit/android/wds/client/ClientUtils.h4
-rw-r--r--Source/WebKit/android/wds/client/Device.h4
-rw-r--r--Source/WebKit/android/wds/client/DeviceList.h4
7 files changed, 14 insertions, 14 deletions
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>