[waffle] [PATCH 04/11] waffle: Fix signature of wcore_platform::window::create()
Chad Versace
chad.versace at linux.intel.com
Tue Dec 16 00:18:28 PST 2014
Fix signature to match that of waffle_window_create(). The types of
parameters 'width' and 'height' didn't match the public header.
As a consequence, also fix the signature of
${PLATFORM}_window_create() for all platforms.
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
src/waffle/android/droid_window.c | 4 ++--
src/waffle/android/droid_window.h | 4 ++--
src/waffle/cgl/cgl_window.h | 4 ++--
src/waffle/cgl/cgl_window.m | 6 +++---
src/waffle/core/wcore_platform.h | 4 ++--
src/waffle/gbm/wgbm_window.c | 4 ++--
src/waffle/gbm/wgbm_window.h | 4 ++--
src/waffle/glx/glx_window.c | 4 ++--
src/waffle/wayland/wayland_window.h | 4 ++--
src/waffle/wgl/wgl_window.c | 8 ++++----
src/waffle/wgl/wgl_window.h | 8 ++++----
src/waffle/x11/x11_window.c | 4 ++--
src/waffle/x11/x11_window.h | 4 ++--
src/waffle/xegl/xegl_window.c | 4 ++--
14 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/waffle/android/droid_window.c b/src/waffle/android/droid_window.c
index a9e6f9b..98e8d2d 100644
--- a/src/waffle/android/droid_window.c
+++ b/src/waffle/android/droid_window.c
@@ -37,8 +37,8 @@
struct wcore_window*
droid_window_create(struct wcore_platform *wc_plat,
struct wcore_config *wc_config,
- int width,
- int height)
+ int32_t width,
+ int32_t height)
{
struct droid_window *self;
struct wegl_config *config = wegl_config(wc_config);
diff --git a/src/waffle/android/droid_window.h b/src/waffle/android/droid_window.h
index 85064cd..b4288d0 100644
--- a/src/waffle/android/droid_window.h
+++ b/src/waffle/android/droid_window.h
@@ -51,8 +51,8 @@ droid_window(struct wcore_window *wc_self)
struct wcore_window*
droid_window_create(struct wcore_platform *wc_plat,
struct wcore_config *wc_config,
- int width,
- int height);
+ int32_t width,
+ int32_t height);
bool
droid_window_destroy(struct wcore_window *wc_self);
diff --git a/src/waffle/cgl/cgl_window.h b/src/waffle/cgl/cgl_window.h
index 4038e09..ee6fa67 100644
--- a/src/waffle/cgl/cgl_window.h
+++ b/src/waffle/cgl/cgl_window.h
@@ -48,8 +48,8 @@ DEFINE_CONTAINER_CAST_FUNC(cgl_window,
struct wcore_window*
cgl_window_create(struct wcore_platform *wc_plat,
struct wcore_config *wc_config,
- int width,
- int height);
+ int32_t width,
+ int32_t height);
bool
cgl_window_destroy(struct wcore_window *wc_self);
diff --git a/src/waffle/cgl/cgl_window.m b/src/waffle/cgl/cgl_window.m
index e4711e1..32049f8 100644
--- a/src/waffle/cgl/cgl_window.m
+++ b/src/waffle/cgl/cgl_window.m
@@ -53,7 +53,7 @@ cgl_window_destroy(struct wcore_window *wc_self)
static WaffleGLView*
-cgl_window_create_gl_view(int width, int height)
+cgl_window_create_gl_view(int32_t width, int32_t height)
{
WaffleGLView *view = [[WaffleGLView alloc]
initWithFrame:NSMakeRect(0, 0, width, height)];
@@ -94,8 +94,8 @@ cgl_window_create_ns_window(NSView *view)
struct wcore_window*
cgl_window_create(struct wcore_platform *wc_plat,
struct wcore_config *wc_config,
- int width,
- int height)
+ int32_t width,
+ int32_t height)
{
struct cgl_window *self;
bool ok = true;
diff --git a/src/waffle/core/wcore_platform.h b/src/waffle/core/wcore_platform.h
index 77943e4..381db5c 100644
--- a/src/waffle/core/wcore_platform.h
+++ b/src/waffle/core/wcore_platform.h
@@ -114,8 +114,8 @@ struct wcore_platform_vtbl {
struct wcore_window*
(*create)(struct wcore_platform *platform,
struct wcore_config *config,
- int width,
- int height);
+ int32_t width,
+ int32_t height);
bool
(*destroy)(struct wcore_window *window);
diff --git a/src/waffle/gbm/wgbm_window.c b/src/waffle/gbm/wgbm_window.c
index edac449..748e72d 100644
--- a/src/waffle/gbm/wgbm_window.c
+++ b/src/waffle/gbm/wgbm_window.c
@@ -59,8 +59,8 @@ wgbm_window_destroy(struct wcore_window *wc_self)
struct wcore_window*
wgbm_window_create(struct wcore_platform *wc_plat,
struct wcore_config *wc_config,
- int width,
- int height)
+ int32_t width,
+ int32_t height)
{
struct wgbm_display *dpy = wgbm_display(wc_config->display);
struct wgbm_platform *plat = wgbm_platform(wegl_platform(wc_plat));
diff --git a/src/waffle/gbm/wgbm_window.h b/src/waffle/gbm/wgbm_window.h
index 729612b..47a75c4 100644
--- a/src/waffle/gbm/wgbm_window.h
+++ b/src/waffle/gbm/wgbm_window.h
@@ -52,8 +52,8 @@ wgbm_window(struct wcore_window *wc_self)
struct wcore_window*
wgbm_window_create(struct wcore_platform *wc_plat,
struct wcore_config *wc_config,
- int width,
- int height);
+ int32_t width,
+ int32_t height);
bool
wgbm_window_destroy(struct wcore_window *wc_self);
diff --git a/src/waffle/glx/glx_window.c b/src/waffle/glx/glx_window.c
index 34fa784..5adf632 100644
--- a/src/waffle/glx/glx_window.c
+++ b/src/waffle/glx/glx_window.c
@@ -52,8 +52,8 @@ glx_window_destroy(struct wcore_window *wc_self)
struct wcore_window*
glx_window_create(struct wcore_platform *wc_plat,
struct wcore_config *wc_config,
- int width,
- int height)
+ int32_t width,
+ int32_t height)
{
struct glx_window *self;
struct glx_display *dpy = glx_display(wc_config->display);
diff --git a/src/waffle/wayland/wayland_window.h b/src/waffle/wayland/wayland_window.h
index 933e751..3e4dbfb 100644
--- a/src/waffle/wayland/wayland_window.h
+++ b/src/waffle/wayland/wayland_window.h
@@ -59,8 +59,8 @@ wayland_window(struct wcore_window *wc_self)
struct wcore_window*
wayland_window_create(struct wcore_platform *wc_plat,
struct wcore_config *wc_config,
- int width,
- int height);
+ int32_t width,
+ int32_t height);
bool
wayland_window_destroy(struct wcore_window *wc_self);
diff --git a/src/waffle/wgl/wgl_window.c b/src/waffle/wgl/wgl_window.c
index a557c2f..03887e3 100644
--- a/src/waffle/wgl/wgl_window.c
+++ b/src/waffle/wgl/wgl_window.c
@@ -68,8 +68,8 @@ wgl_window_priv_destroy(struct wcore_window *wc_self)
struct wcore_window*
wgl_window_create(struct wcore_platform *wc_plat,
struct wcore_config *wc_config,
- int width,
- int height)
+ int32_t width,
+ int32_t height)
{
struct wgl_config *config = wgl_config(wc_config);
bool ok;
@@ -95,8 +95,8 @@ wgl_window_create(struct wcore_platform *wc_plat,
struct wcore_window*
wgl_window_priv_create(struct wcore_platform *wc_plat,
struct wcore_config *wc_config,
- int width,
- int height)
+ int32_t width,
+ int32_t height)
{
struct wgl_platform *plat = wgl_platform(wc_plat);
struct wgl_window *self;
diff --git a/src/waffle/wgl/wgl_window.h b/src/waffle/wgl/wgl_window.h
index a60205d..34beac8 100644
--- a/src/waffle/wgl/wgl_window.h
+++ b/src/waffle/wgl/wgl_window.h
@@ -48,8 +48,8 @@ wgl_window(struct wcore_window *wcore)
struct wcore_window*
wgl_window_priv_create(struct wcore_platform *wc_plat,
struct wcore_config *wc_config,
- int width,
- int height);
+ int32_t width,
+ int32_t height);
bool
wgl_window_priv_destroy(struct wcore_window *wc_self);
@@ -57,8 +57,8 @@ wgl_window_priv_destroy(struct wcore_window *wc_self);
struct wcore_window*
wgl_window_create(struct wcore_platform *wc_plat,
struct wcore_config *wc_config,
- int width,
- int height);
+ int32_t width,
+ int32_t height);
bool
wgl_window_destroy(struct wcore_window *wc_self);
diff --git a/src/waffle/x11/x11_window.c b/src/waffle/x11/x11_window.c
index b2e3631..308d4ce 100644
--- a/src/waffle/x11/x11_window.c
+++ b/src/waffle/x11/x11_window.c
@@ -70,8 +70,8 @@ bool
x11_window_init(struct x11_window *self,
struct x11_display *dpy,
xcb_visualid_t visual_id,
- int width,
- int height)
+ int32_t width,
+ int32_t height)
{
xcb_colormap_t colormap = 0;
xcb_window_t window = 0;
diff --git a/src/waffle/x11/x11_window.h b/src/waffle/x11/x11_window.h
index 812b146..262b156 100644
--- a/src/waffle/x11/x11_window.h
+++ b/src/waffle/x11/x11_window.h
@@ -40,8 +40,8 @@ bool
x11_window_init(struct x11_window *self,
struct x11_display *dpy,
xcb_visualid_t visual_id,
- int width,
- int height);
+ int32_t width,
+ int32_t height);
bool
x11_window_teardown(struct x11_window *self);
diff --git a/src/waffle/xegl/xegl_window.c b/src/waffle/xegl/xegl_window.c
index ce638b4..9a20f75 100644
--- a/src/waffle/xegl/xegl_window.c
+++ b/src/waffle/xegl/xegl_window.c
@@ -55,8 +55,8 @@ xegl_window_destroy(struct wcore_window *wc_self)
struct wcore_window*
xegl_window_create(struct wcore_platform *wc_plat,
struct wcore_config *wc_config,
- int width,
- int height)
+ int32_t width,
+ int32_t height)
{
struct xegl_window *self;
struct xegl_display *dpy = xegl_display(wc_config->display);
--
2.2.0
More information about the waffle
mailing list