| Index: third_party/wayland-protocols/include/protocol/scaler-server-protocol.h
|
| diff --git a/third_party/wayland-protocols/include/protocol/scaler-server-protocol.h b/third_party/wayland-protocols/include/protocol/scaler-server-protocol.h
|
| index 0684fb1a1301c6fd6e95a07979e552cfdb3e9126..8c476fe32848915f59ea533ccd02a42b0cad1f1f 100644
|
| --- a/third_party/wayland-protocols/include/protocol/scaler-server-protocol.h
|
| +++ b/third_party/wayland-protocols/include/protocol/scaler-server-protocol.h
|
| @@ -1,17 +1,17 @@
|
| -/*
|
| +/*
|
| * Copyright © 2013-2014 Collabora, Ltd.
|
| - *
|
| + *
|
| * Permission is hereby granted, free of charge, to any person obtaining a
|
| * copy of this software and associated documentation files (the "Software"),
|
| * to deal in the Software without restriction, including without limitation
|
| * the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
| * and/or sell copies of the Software, and to permit persons to whom the
|
| * Software is furnished to do so, subject to the following conditions:
|
| - *
|
| + *
|
| * The above copyright notice and this permission notice (including the next
|
| * paragraph) shall be included in all copies or substantial portions of the
|
| * Software.
|
| - *
|
| + *
|
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
| @@ -30,12 +30,13 @@ extern "C" {
|
|
|
| #include <stdint.h>
|
| #include <stddef.h>
|
| -#include "wayland-util.h"
|
| +#include "wayland-server.h"
|
|
|
| struct wl_client;
|
| struct wl_resource;
|
|
|
| struct wl_scaler;
|
| +struct wl_surface;
|
| struct wl_viewport;
|
|
|
| extern const struct wl_interface wl_scaler_interface;
|
| @@ -85,6 +86,7 @@ struct wl_scaler_interface {
|
| struct wl_resource *surface);
|
| };
|
|
|
| +
|
| #ifndef WL_VIEWPORT_ERROR_ENUM
|
| #define WL_VIEWPORT_ERROR_ENUM
|
| enum wl_viewport_error {
|
| @@ -247,6 +249,7 @@ struct wl_viewport_interface {
|
| int32_t height);
|
| };
|
|
|
| +
|
| #ifdef __cplusplus
|
| }
|
| #endif
|
|
|