From efe764b492b9516e874b2e9b5d4cdc4c48c0e4da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Wed, 18 Aug 2021 23:49:03 +0200 Subject: [PATCH] Remove blank line before the end of some structs --- src/cocoa_platform.h | 5 ----- src/egl_context.h | 2 -- src/glx_context.h | 2 -- src/nsgl_context.h | 2 -- src/osmesa_context.h | 2 -- src/posix_thread.h | 2 -- src/posix_time.h | 1 - src/wgl_context.h | 2 -- src/win32_platform.h | 7 ------- src/wl_platform.h | 5 ----- src/x11_platform.h | 4 ---- 11 files changed, 34 deletions(-) diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h index 64a998ff..f9e80766 100644 --- a/src/cocoa_platform.h +++ b/src/cocoa_platform.h @@ -130,7 +130,6 @@ typedef struct _GLFWwindowNS // since the last cursor motion event was processed // This is kept to counteract Cocoa doing the same internally double cursorWarpDeltaX, cursorWarpDeltaY; - } _GLFWwindowNS; // Cocoa-specific global data @@ -164,7 +163,6 @@ typedef struct _GLFWlibraryNS PFN_LMGetKbdType GetKbdType; CFStringRef kPropertyUnicodeKeyLayoutData; } tis; - } _GLFWlibraryNS; // Cocoa-specific per-monitor data @@ -176,7 +174,6 @@ typedef struct _GLFWmonitorNS uint32_t unitNumber; id screen; double fallbackRefreshRate; - } _GLFWmonitorNS; // Cocoa-specific per-cursor data @@ -184,7 +181,6 @@ typedef struct _GLFWmonitorNS typedef struct _GLFWcursorNS { id object; - } _GLFWcursorNS; // Cocoa-specific global timer data @@ -192,7 +188,6 @@ typedef struct _GLFWcursorNS typedef struct _GLFWtimerNS { uint64_t frequency; - } _GLFWtimerNS; diff --git a/src/egl_context.h b/src/egl_context.h index 4c84072e..22928b5d 100644 --- a/src/egl_context.h +++ b/src/egl_context.h @@ -163,7 +163,6 @@ typedef struct _GLFWcontextEGL EGLSurface surface; void* client; - } _GLFWcontextEGL; // EGL-specific global data @@ -211,7 +210,6 @@ typedef struct _GLFWlibraryEGL PFNEGLGETPLATFORMDISPLAYEXTPROC GetPlatformDisplayEXT; PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC CreatePlatformWindowSurfaceEXT; - } _GLFWlibraryEGL; diff --git a/src/glx_context.h b/src/glx_context.h index 94f07e2e..a50f09bc 100644 --- a/src/glx_context.h +++ b/src/glx_context.h @@ -117,7 +117,6 @@ typedef struct _GLFWcontextGLX { GLXContext handle; GLXWindow window; - } _GLFWcontextGLX; // GLX-specific global data @@ -165,7 +164,6 @@ typedef struct _GLFWlibraryGLX GLFWbool EXT_create_context_es2_profile; GLFWbool ARB_create_context_no_error; GLFWbool ARB_context_flush_control; - } _GLFWlibraryGLX; GLFWbool _glfwInitGLX(void); diff --git a/src/nsgl_context.h b/src/nsgl_context.h index 9c31436c..55b9bf14 100644 --- a/src/nsgl_context.h +++ b/src/nsgl_context.h @@ -44,7 +44,6 @@ typedef struct _GLFWcontextNSGL { id pixelFormat; id object; - } _GLFWcontextNSGL; // NSGL-specific global data @@ -53,7 +52,6 @@ typedef struct _GLFWlibraryNSGL { // dlopen handle for OpenGL.framework (for glfwGetProcAddress) CFBundleRef framework; - } _GLFWlibraryNSGL; diff --git a/src/osmesa_context.h b/src/osmesa_context.h index ce1f1a29..74bc2a99 100644 --- a/src/osmesa_context.h +++ b/src/osmesa_context.h @@ -62,7 +62,6 @@ typedef struct _GLFWcontextOSMesa int width; int height; void* buffer; - } _GLFWcontextOSMesa; // OSMesa-specific global data @@ -78,7 +77,6 @@ typedef struct _GLFWlibraryOSMesa PFN_OSMesaGetColorBuffer GetColorBuffer; PFN_OSMesaGetDepthBuffer GetDepthBuffer; PFN_OSMesaGetProcAddress GetProcAddress; - } _GLFWlibraryOSMesa; diff --git a/src/posix_thread.h b/src/posix_thread.h index 85ce596c..bfb325af 100644 --- a/src/posix_thread.h +++ b/src/posix_thread.h @@ -37,7 +37,6 @@ typedef struct _GLFWtlsPOSIX { GLFWbool allocated; pthread_key_t key; - } _GLFWtlsPOSIX; // POSIX-specific mutex data @@ -46,6 +45,5 @@ typedef struct _GLFWmutexPOSIX { GLFWbool allocated; pthread_mutex_t handle; - } _GLFWmutexPOSIX; diff --git a/src/posix_time.h b/src/posix_time.h index 17805cf6..cc7ba990 100644 --- a/src/posix_time.h +++ b/src/posix_time.h @@ -37,7 +37,6 @@ typedef struct _GLFWtimerPOSIX { clockid_t clock; uint64_t frequency; - } _GLFWtimerPOSIX; diff --git a/src/wgl_context.h b/src/wgl_context.h index 2cf7e4e5..702eaada 100644 --- a/src/wgl_context.h +++ b/src/wgl_context.h @@ -115,7 +115,6 @@ typedef struct _GLFWcontextWGL HDC dc; HGLRC handle; int interval; - } _GLFWcontextWGL; // WGL-specific global data @@ -148,7 +147,6 @@ typedef struct _GLFWlibraryWGL GLFWbool ARB_create_context_robustness; GLFWbool ARB_create_context_no_error; GLFWbool ARB_context_flush_control; - } _GLFWlibraryWGL; diff --git a/src/win32_platform.h b/src/win32_platform.h index a16047ae..500da470 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -321,7 +321,6 @@ typedef struct _GLFWwindowWin32 int lastCursorPosX, lastCursorPosY; // The last recevied high surrogate when decoding pairs of UTF-16 messages WCHAR highSurrogate; - } _GLFWwindowWin32; // Win32-specific global data @@ -388,7 +387,6 @@ typedef struct _GLFWlibraryWin32 HINSTANCE instance; PFN_RtlVerifyVersionInfo RtlVerifyVersionInfo_; } ntdll; - } _GLFWlibraryWin32; // Win32-specific per-monitor data @@ -403,7 +401,6 @@ typedef struct _GLFWmonitorWin32 char publicDisplayName[32]; GLFWbool modesPruned; GLFWbool modeChanged; - } _GLFWmonitorWin32; // Win32-specific per-cursor data @@ -411,7 +408,6 @@ typedef struct _GLFWmonitorWin32 typedef struct _GLFWcursorWin32 { HCURSOR handle; - } _GLFWcursorWin32; // Win32-specific global timer data @@ -420,7 +416,6 @@ typedef struct _GLFWtimerWin32 { GLFWbool hasPC; uint64_t frequency; - } _GLFWtimerWin32; // Win32-specific thread local storage data @@ -429,7 +424,6 @@ typedef struct _GLFWtlsWin32 { GLFWbool allocated; DWORD index; - } _GLFWtlsWin32; // Win32-specific mutex data @@ -438,7 +432,6 @@ typedef struct _GLFWmutexWin32 { GLFWbool allocated; CRITICAL_SECTION section; - } _GLFWmutexWin32; diff --git a/src/wl_platform.h b/src/wl_platform.h index d6017513..777ae2e7 100644 --- a/src/wl_platform.h +++ b/src/wl_platform.h @@ -225,7 +225,6 @@ typedef enum _GLFWdecorationSideWayland leftDecoration, rightDecoration, bottomDecoration, - } _GLFWdecorationSideWayland; typedef struct _GLFWdecorationWayland @@ -233,7 +232,6 @@ typedef struct _GLFWdecorationWayland struct wl_surface* surface; struct wl_subsurface* subsurface; struct wp_viewport* viewport; - } _GLFWdecorationWayland; // Wayland-specific per-window data @@ -282,7 +280,6 @@ typedef struct _GLFWwindowWayland _GLFWdecorationWayland top, left, right, bottom; int focus; } decorations; - } _GLFWwindowWayland; // Wayland-specific global data @@ -413,7 +410,6 @@ typedef struct _GLFWlibraryWayland PFN_wl_egl_window_destroy window_destroy; PFN_wl_egl_window_resize window_resize; } egl; - } _GLFWlibraryWayland; // Wayland-specific per-monitor data @@ -427,7 +423,6 @@ typedef struct _GLFWmonitorWayland int x; int y; int scale; - } _GLFWmonitorWayland; // Wayland-specific per-cursor data diff --git a/src/x11_platform.h b/src/x11_platform.h index c5137bc3..2db58eea 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -422,7 +422,6 @@ typedef struct _GLFWwindowX11 // The time of the last KeyPress event per keycode, for discarding // duplicate key events generated for some keys by ibus Time keyPressTimes[256]; - } _GLFWwindowX11; // X11-specific global data @@ -751,7 +750,6 @@ typedef struct _GLFWlibraryX11 PFN_XShapeQueryVersion QueryVersion; PFN_XShapeCombineMask ShapeCombineMask; } xshape; - } _GLFWlibraryX11; // X11-specific per-monitor data @@ -765,7 +763,6 @@ typedef struct _GLFWmonitorX11 // Index of corresponding Xinerama screen, // for EWMH full screen window placement int index; - } _GLFWmonitorX11; // X11-specific per-cursor data @@ -773,7 +770,6 @@ typedef struct _GLFWmonitorX11 typedef struct _GLFWcursorX11 { Cursor handle; - } _GLFWcursorX11;