tjh.dev
1XPilot-NG uses SDL_Window (now an SDL type name) as a variable name
2
3--- a/src/client/sdl/scrap.c 2025-03-23 11:48:45.045699445 +0100
4+++ b.src/client/sdl/scrap.c 2025-03-23 11:48:48.773699690 +0100
5@@ -57,13 +57,13 @@
6 #if defined(X11_SCRAP)
7 /* * */
8 static Display *SDL_Display;
9-static Window SDL_Window;
10+static Window XPilot_SDL_Window;
11 static void (*Lock_Display)(void);
12 static void (*Unlock_Display)(void);
13
14 #elif defined(WIN_SCRAP)
15 /* * */
16-static HWND SDL_Window;
17+static HWND XPilot_SDL_Window;
18
19 #elif defined(QNX_SCRAP)
20 /* * */
21@@ -285,7 +285,7 @@
22 if ( info.subsystem == SDL_SYSWM_X11 )
23 {
24 SDL_Display = info.info.x11.display;
25- SDL_Window = info.info.x11.window;
26+ XPilot_SDL_Window = info.info.x11.window;
27 Lock_Display = info.info.x11.lock_func;
28 Unlock_Display = info.info.x11.unlock_func;
29
30@@ -302,7 +302,7 @@
31
32 #elif defined(WIN_SCRAP)
33 /* * */
34- SDL_Window = info.window;
35+ XPilot_SDL_Window = info.window;
36 retval = 0;
37
38 #elif defined(QNX_SCRAP)
39@@ -323,12 +323,12 @@
40 #if defined(X11_SCRAP)
41 /* * */
42 Lock_Display();
43- retval = ( XGetSelectionOwner(SDL_Display, XA_PRIMARY) != SDL_Window );
44+ retval = ( XGetSelectionOwner(SDL_Display, XA_PRIMARY) != XPilot_SDL_Window );
45 Unlock_Display();
46
47 #elif defined(WIN_SCRAP)
48 /* * */
49- retval = ( GetClipboardOwner() != SDL_Window );
50+ retval = ( GetClipboardOwner() != XPilot_SDL_Window );
51
52 #elif defined(QNX_SCRAP)
53 /* * */
54@@ -360,13 +360,13 @@
55 XA_CUT_BUFFER0, format, 8, PropModeReplace, (unsigned char *)dst, dstlen);
56 free(dst);
57 if ( lost_scrap() )
58- XSetSelectionOwner(SDL_Display, XA_PRIMARY, SDL_Window, CurrentTime);
59+ XSetSelectionOwner(SDL_Display, XA_PRIMARY, XPilot_SDL_Window, CurrentTime);
60 Unlock_Display();
61 }
62
63 #elif defined(WIN_SCRAP)
64 /* * */
65- if ( OpenClipboard(SDL_Window) )
66+ if ( OpenClipboard(XPilot_SDL_Window) )
67 {
68 HANDLE hMem;
69
70@@ -461,7 +461,7 @@
71 Lock_Display();
72 owner = XGetSelectionOwner(SDL_Display, XA_PRIMARY);
73 Unlock_Display();
74- if ( (owner == None) || (owner == SDL_Window) )
75+ if ( (owner == None) || (owner == XPilot_SDL_Window) )
76 {
77 owner = DefaultRootWindow(SDL_Display);
78 selection1 = XA_CUT_BUFFER0;
79@@ -471,7 +471,7 @@
80 int selection_response = 0;
81 SDL_Event event;
82
83- owner = SDL_Window;
84+ owner = XPilot_SDL_Window;
85 Lock_Display();
86 selection1 = XInternAtom(SDL_Display, "SDL_SELECTION", False);
87 XConvertSelection(SDL_Display, XA_PRIMARY, format,
88@@ -511,7 +511,7 @@
89
90 #elif defined(WIN_SCRAP)
91 /* * */
92- if ( IsClipboardFormatAvailable(format) && OpenClipboard(SDL_Window) )
93+ if ( IsClipboardFormatAvailable(format) && OpenClipboard(XPilot_SDL_Window) )
94 {
95 HANDLE hMem;
96 char *src;