diff options
author | Steve Block <steveblock@google.com> | 2011-06-08 11:55:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 11:55:45 +0100 |
commit | 3d1195ca6a380e5af16e3a505a007369cf18a4db (patch) | |
tree | bdbf2f48ece0b654af8c02e9bda65563a690ebb4 /Source/WebKit/android/plugins | |
parent | 8dc5cf421626552644b657639d1e75549a3ff51f (diff) | |
download | external_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/plugins')
10 files changed, 25 insertions, 25 deletions
diff --git a/Source/WebKit/android/plugins/ANPOpenGL_npapi.h b/Source/WebKit/android/plugins/ANPOpenGL_npapi.h index 5aabbc4..0e336a6 100644 --- a/Source/WebKit/android/plugins/ANPOpenGL_npapi.h +++ b/Source/WebKit/android/plugins/ANPOpenGL_npapi.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANPOpenGL_npapi_H -#define ANPOpenGL_npapi_H +#ifndef ANPOpenGL_npapi_h +#define ANPOpenGL_npapi_h #include "android_npapi.h" #include <EGL/egl.h> @@ -60,4 +60,4 @@ struct ANPOpenGLInterfaceV0 : ANPInterface { void (*invertPluginContent)(NPP instance, bool isContentInverted); }; -#endif //ANPOpenGL_npapi_H +#endif // ANPOpenGL_npapi_h diff --git a/Source/WebKit/android/plugins/ANPSurface_npapi.h b/Source/WebKit/android/plugins/ANPSurface_npapi.h index 910a948..5eb240d 100644 --- a/Source/WebKit/android/plugins/ANPSurface_npapi.h +++ b/Source/WebKit/android/plugins/ANPSurface_npapi.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANPSurface_npapi_H -#define ANPSurface_npapi_H +#ifndef ANPSurface_npapi_h +#define ANPSurface_npapi_h #include "android_npapi.h" #include <jni.h> @@ -45,4 +45,4 @@ struct ANPSurfaceInterfaceV0 : ANPInterface { void (*unlock)(JNIEnv* env, jobject surface); }; -#endif //ANPSurface_npapi_H +#endif // ANPSurface_npapi_h diff --git a/Source/WebKit/android/plugins/ANPSystem_npapi.h b/Source/WebKit/android/plugins/ANPSystem_npapi.h index 835bc7c..83cec3b 100644 --- a/Source/WebKit/android/plugins/ANPSystem_npapi.h +++ b/Source/WebKit/android/plugins/ANPSystem_npapi.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANPSystem_npapi_H -#define ANPSystem_npapi_H +#ifndef ANPSystem_npapi_h +#define ANPSystem_npapi_h #include "android_npapi.h" #include <jni.h> @@ -69,4 +69,4 @@ struct ANPSystemInterfaceV2 : ANPInterface { void (*setPowerState)(NPP instance, ANPPowerState powerState); }; -#endif //ANPSystem_npapi_H +#endif // ANPSystem_npapi_h diff --git a/Source/WebKit/android/plugins/ANPVideo_npapi.h b/Source/WebKit/android/plugins/ANPVideo_npapi.h index 18e0231..3d234f2 100644 --- a/Source/WebKit/android/plugins/ANPVideo_npapi.h +++ b/Source/WebKit/android/plugins/ANPVideo_npapi.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ANPVideo_npapi_H -#define ANPVideo_npapi_H +#ifndef ANPVideo_npapi_h +#define ANPVideo_npapi_h #include "android_npapi.h" #include <android/native_window.h> @@ -58,4 +58,4 @@ struct ANPVideoInterfaceV0 : ANPInterface { void (*releaseNativeWindow)(NPP instance, ANativeWindow* window); }; -#endif //ANPVideo_npapi_H +#endif // ANPVideo_npapi_h diff --git a/Source/WebKit/android/plugins/PluginDebugAndroid.h b/Source/WebKit/android/plugins/PluginDebugAndroid.h index 5002882..25db830 100644 --- a/Source/WebKit/android/plugins/PluginDebugAndroid.h +++ b/Source/WebKit/android/plugins/PluginDebugAndroid.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PLUGIN_DEBUG_ANDROID_H__ -#define PLUGIN_DEBUG_ANDROID_H__ +#ifndef PluginDebugAndroid_h +#define PluginDebugAndroid_h #include "android_npapi.h" @@ -55,4 +55,4 @@ void anp_logPluginEvent(void* npp, const ANPEvent* event, int16_t returnVal, int #endif -#endif // defined(PLUGIN_DEBUG_ANDROID_H__) +#endif // defined(PluginDebugAndroid_h) diff --git a/Source/WebKit/android/plugins/PluginTimer.h b/Source/WebKit/android/plugins/PluginTimer.h index 231dca5..8aab09f 100644 --- a/Source/WebKit/android/plugins/PluginTimer.h +++ b/Source/WebKit/android/plugins/PluginTimer.h @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PluginTimer_H -#define PluginTimer_H +#ifndef PluginTimer_h +#define PluginTimer_h #include "FastAllocBase.h" #include "RefCounted.h" diff --git a/Source/WebKit/android/plugins/PluginViewBridgeAndroid.h b/Source/WebKit/android/plugins/PluginViewBridgeAndroid.h index 5d16f46..50dd3fc 100644 --- a/Source/WebKit/android/plugins/PluginViewBridgeAndroid.h +++ b/Source/WebKit/android/plugins/PluginViewBridgeAndroid.h @@ -25,8 +25,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PluginViewBridgeAndroid_H -#define PluginViewBridgeAndroid_H +#ifndef PluginViewBridgeAndroid_h +#define PluginViewBridgeAndroid_h #include "PluginView.h" #include "WebCoreViewBridge.h" diff --git a/Source/WebKit/android/plugins/PluginWidgetAndroid.h b/Source/WebKit/android/plugins/PluginWidgetAndroid.h index cbebb7f..0e4cf7e 100644 --- a/Source/WebKit/android/plugins/PluginWidgetAndroid.h +++ b/Source/WebKit/android/plugins/PluginWidgetAndroid.h @@ -23,8 +23,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PluginWidgetAndroid_H -#define PluginWidgetAndroid_H +#ifndef PluginWidgetAndroid_h +#define PluginWidgetAndroid_h #include "android_npapi.h" #include "ANPSystem_npapi.h" diff --git a/Source/WebKit/android/plugins/SurfaceCallback.h b/Source/WebKit/android/plugins/SurfaceCallback.h index 945fc3f..6ed95bd 100644 --- a/Source/WebKit/android/plugins/SurfaceCallback.h +++ b/Source/WebKit/android/plugins/SurfaceCallback.h @@ -24,8 +24,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SurfaceCallback_H -#define SurfaceCallback_H +#ifndef SurfaceCallback_h +#define SurfaceCallback_h namespace android { diff --git a/Source/WebKit/android/plugins/android_npapi.h b/Source/WebKit/android/plugins/android_npapi.h index 4ff45c8..23db70b 100644 --- a/Source/WebKit/android/plugins/android_npapi.h +++ b/Source/WebKit/android/plugins/android_npapi.h @@ -32,8 +32,8 @@ functionality is provided via function-ptrs (e.g. time, sound) */ -#ifndef android_npapi_H -#define android_npapi_H +#ifndef android_npapi_h +#define android_npapi_h #include <stdint.h> |