[gtk/wip/otte/gdk-headers: 4/6] win32: Fix gcc warnings

[Benjamin Otte <otte src gnome org>]

commit c7424169d6fecdd21eb8d040266c821975126470
Author: Benjamin Otte <otte redhat com>
Date:   Fri Sep 24 21:22:12 2021 +0200

    win32: Fix gcc warnings

 gdk/win32/gdkcairocontext-win32.c  | 7 -------
 gdk/win32/gdkdisplay-win32.c       | 2 ++
 gdk/win32/gdkglcontext-win32-wgl.c | 8 --------
 3 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/gdk/win32/gdkcairocontext-win32.c b/gdk/win32/gdkcairocontext-win32.c
index a46891d8a4..9eb115ffcd 100644
--- a/gdk/win32/gdkcairocontext-win32.c
+++ b/gdk/win32/gdkcairocontext-win32.c
@@ -57,14 +57,12 @@ gdk_win32_cairo_context_begin_frame (GdkDrawContext *draw_context,
 {
   GdkWin32CairoContext *self = GDK_WIN32_CAIRO_CONTEXT (draw_context);
   GdkSurface *surface;
-  GdkWin32Surface *impl;
   int scale;
   cairo_t *cr;
   int width, height;
   RECT queued_window_rect;
 
   surface = gdk_draw_context_get_surface (draw_context);
-  impl = GDK_WIN32_SURFACE (surface);
   scale = gdk_surface_get_scale_factor (surface);
 
   queued_window_rect = gdk_win32_surface_handle_queued_move_resize (draw_context);
@@ -121,11 +119,6 @@ gdk_win32_cairo_context_end_frame (GdkDrawContext *draw_context,
                                    cairo_region_t *painted)
 {
   GdkWin32CairoContext *self = GDK_WIN32_CAIRO_CONTEXT (draw_context);
-  GdkSurface *surface;
-  int scale;
-
-  surface = gdk_draw_context_get_surface (draw_context);
-  scale = gdk_surface_get_scale_factor (surface);
 
   /* The code to resize double-buffered windows immediately
    * before blitting the buffer contents onto them used
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 84d99b78a6..83038296dc 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -1208,7 +1208,9 @@ gdk_win32_display_init_gl (GdkDisplay  *display,
 gpointer
 gdk_win32_display_get_egl_display (GdkDisplay *display)
 {
+#ifdef GDK_WIN32_ENABLE_EGL
   GdkWin32Display *display_win32;
+#endif
 
   g_return_val_if_fail (GDK_IS_WIN32_DISPLAY (display), NULL);
 
diff --git a/gdk/win32/gdkglcontext-win32-wgl.c b/gdk/win32/gdkglcontext-win32-wgl.c
index 97f3b81356..8f00cb242f 100644
--- a/gdk/win32/gdkglcontext-win32-wgl.c
+++ b/gdk/win32/gdkglcontext-win32-wgl.c
@@ -80,14 +80,12 @@ gdk_win32_gl_context_wgl_end_frame (GdkDrawContext *draw_context,
   GdkWin32GLContextWGL *context_wgl = GDK_WIN32_GL_CONTEXT_WGL (context);
   GdkSurface *surface = gdk_gl_context_get_surface (context);
   GdkWin32Display *display_win32 = (GDK_WIN32_DISPLAY (gdk_gl_context_get_display (context)));
-  cairo_rectangle_int_t whole_window;
   gboolean can_wait = display_win32->hasWglOMLSyncControl;
   HDC hdc;
 
   GDK_DRAW_CONTEXT_CLASS (gdk_win32_gl_context_wgl_parent_class)->end_frame (draw_context, painted);
 
   gdk_gl_context_make_current (context);
-  whole_window = (GdkRectangle) { 0, 0, gdk_surface_get_width (surface), gdk_surface_get_height (surface) };
 
   gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "win32", "swap buffers");
 
@@ -122,11 +120,6 @@ static void
 gdk_win32_gl_context_wgl_begin_frame (GdkDrawContext *draw_context,
                                       cairo_region_t *update_area)
 {
-  GdkGLContext *context = GDK_GL_CONTEXT (draw_context);
-  GdkSurface *surface;
-
-  surface = gdk_gl_context_get_surface (context);
-
   gdk_win32_surface_handle_queued_move_resize (draw_context);
 
   GDK_DRAW_CONTEXT_CLASS (gdk_win32_gl_context_wgl_parent_class)->begin_frame (draw_context, update_area);
@@ -563,7 +556,6 @@ gdk_win32_gl_context_wgl_realize (GdkGLContext *context,
   HGLRC hglrc;
   int pixel_format;
   HDC hdc;
-  HWND hwnd;
 
   GdkSurface *surface = gdk_gl_context_get_surface (context);
   GdkDisplay *display = gdk_gl_context_get_display (context);