hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-11-15 05:23:40 +00:00
Code Issues Projects Releases Wiki Activity

xquartz/GL: sanitize QuickDraw WindowPtr in capabilities.c

Browse source 
capabilities.c includes <ApplicationServices/ApplicationServices.h>, which
pulls in QuickDraw's WindowPtr, and then includes "os.h".  Since commit
976e6cd ("include: new header for fundamental pointer types") os.h pulls in
xlibre_ptrtypes.h, which defines the X server's own WindowPtr, so the two
now conflict:

    error: conflicting types for 'WindowPtr'; have 'struct _Window *'

The file already renames Cursor and BOOL out of the way around the Apple
headers; do the same for WindowPtr and Picture, matching the pattern in
sanitizedCarbon.h.

Fixes: https://github.com/X11Libre/xserver/issues/3461
Signed-off-by: Sergey Fedorov <vital.had@gmail.com>
This commit is contained in:
Sergey Fedorov 2026-08-01 06:01:19 +00:00 • committed by Enrico Weigelt
commit e4cd083449
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hw/xquartz/GL/capabilities.c
View file

@ -26,8 +26,13 @@
#include <stdlib.h>
#include <assert.h>
#define Cursor Mac_Cursor
#define BOOL Mac_BOOL
/* QuickDraw in ApplicationServices conflicts with the basic X server headers
* (e.g. WindowPtr, now pulled in transitively via os.h -> xlibre_ptrtypes.h).
* Rename the QuickDraw symbols out of the way, matching sanitizedCarbon.h. */
#define Cursor Mac_Cursor
#define BOOL Mac_BOOL
#define WindowPtr QD_WindowPtr
#define Picture QD_Picture
#include <OpenGL/OpenGL.h>
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
@ -35,6 +40,8 @@
#include <ApplicationServices/ApplicationServices.h>
#undef Cursor
#undef BOOL
#undef WindowPtr
#undef Picture
#include "capabilities.h"