From 874ddeeea1fb1c3bd1e2f8975dffbb6b4a684066 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Wed, 2 Mar 2022 16:28:45 +0000 Subject: Fix [e049e2a7b8]: macOS : error on compilation with tkMacOSXMouseEvent.c, due to merge conflict --- macosx/tkMacOSXMouseEvent.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c index 5dea481..0624f30 100644 --- a/macosx/tkMacOSXMouseEvent.c +++ b/macosx/tkMacOSXMouseEvent.c @@ -677,9 +677,6 @@ XQueryPointer( { int getGlobal = (root_x_return && root_y_return); int getLocal = (win_x_return && win_y_return && w != None); - (void)display; - (void)root_return; - (void)child_return; if (getGlobal || getLocal) { NSPoint global = [NSEvent mouseLocation]; -- cgit v0.12