Attachment 827854 Details for Bug 1160423

[patch] u_fno-common.patch

u_fno-common.patch (text/plain), 8.79 KB, created by Stefan Dirsch on 2020-01-20 16:47:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2020-01-20 16:47:05 UTC

Size: 8.79 KB

patch

obsolete

>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/hw/dmx/config/dmxconfig.c xserver-1.20.7+0/hw/dmx/config/dmxconfig.c
>--- xserver-1.20.7+0.old/hw/dmx/config/dmxconfig.c	2020-01-20 14:49:07.633280426 +0000
>+++ xserver-1.20.7+0/hw/dmx/config/dmxconfig.c	2020-01-20 14:54:56.248028037 +0000
>@@ -72,7 +72,6 @@ typedef struct DMXConfigCmdStruct {
>     DMXConfigList *xinputs;
> } DMXConfigCmd, *DMXConfigCmdPtr;
> 
>-DMXConfigEntryPtr dmxConfigEntry;
> static DMXConfigCmd dmxConfigCmd;
> 
> static int dmxDisplaysFromCommandLine;
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/hw/dmx/config/xdmxconfig.c xserver-1.20.7+0/hw/dmx/config/xdmxconfig.c
>--- xserver-1.20.7+0.old/hw/dmx/config/xdmxconfig.c	2020-01-20 14:49:07.637280503 +0000
>+++ xserver-1.20.7+0/hw/dmx/config/xdmxconfig.c	2020-01-20 14:55:50.397074517 +0000
>@@ -65,7 +65,6 @@ extern FILE *yyin;
> #define DMX_CANVAS_WIDTH  400
> #define DMX_CANVAS_HEIGHT 500
> 
>-DMXConfigEntryPtr dmxConfigEntry;
> static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual;
> static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay;
> static int dmxConfigGrabbed, dmxConfigGrabbedFine;
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/hw/dmx/glxProxy/glxext.c xserver-1.20.7+0/hw/dmx/glxProxy/glxext.c
>--- xserver-1.20.7+0.old/hw/dmx/glxProxy/glxext.c	2020-01-20 14:49:07.645280659 +0000
>+++ xserver-1.20.7+0/hw/dmx/glxProxy/glxext.c	2020-01-20 14:58:56.192664501 +0000
>@@ -47,8 +47,6 @@
> #include "extinit.h"
> #include "glx_extinit.h"
> 
>-int noGlxExtension;
>-
> /*
> ** Forward declarations.
> */
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/hw/xwayland/Makefile.am xserver-1.20.7+0/hw/xwayland/Makefile.am
>--- xserver-1.20.7+0.old/hw/xwayland/Makefile.am	2020-01-20 14:49:07.773283138 +0000
>+++ xserver-1.20.7+0/hw/xwayland/Makefile.am	2020-01-20 16:04:33.668360903 +0000
>@@ -3,6 +3,7 @@ bin_PROGRAMS = Xwayland
> Xwayland_CFLAGS =				\
> 	-I$(top_srcdir)/glamor			\
> 	-I$(top_srcdir)/dri3			\
>+	-I$(top_srcdir)/hw/xfree86/common       \
> 	-DHAVE_DIX_CONFIG_H			\
> 	$(XWAYLANDMODULES_CFLAGS)		\
> 	$(DIX_CFLAGS)				\
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/hw/xwayland/xwayland.c xserver-1.20.7+0/hw/xwayland/xwayland.c
>--- xserver-1.20.7+0.old/hw/xwayland/xwayland.c	2020-01-20 14:49:07.773283138 +0000
>+++ xserver-1.20.7+0/hw/xwayland/xwayland.c	2020-01-20 16:04:51.380698382 +0000
>@@ -40,7 +40,7 @@
> 
> #ifdef XF86VIDMODE
> #include <X11/extensions/xf86vmproto.h>
>-_X_EXPORT Bool noXFree86VidModeExtension;
>+#include "xf86Extensions.h"
> #endif
> 
> void
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/test/xi1/protocol-xchangedevicecontrol.c xserver-1.20.7+0/test/xi1/protocol-xchangedevicecontrol.c
>--- xserver-1.20.7+0.old/test/xi1/protocol-xchangedevicecontrol.c	2020-01-20 14:49:07.833284301 +0000
>+++ xserver-1.20.7+0/test/xi1/protocol-xchangedevicecontrol.c	2020-01-20 16:05:04.744953022 +0000
>@@ -37,7 +37,6 @@
> 
> #include "protocol-common.h"
> 
>-ClientRec client_window;
> static ClientRec client_request;
> 
> static void
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/test/xi2/protocol-common.c xserver-1.20.7+0/test/xi2/protocol-common.c
>--- xserver-1.20.7+0.old/test/xi2/protocol-common.c	2020-01-20 14:49:07.833284301 +0000
>+++ xserver-1.20.7+0/test/xi2/protocol-common.c	2020-01-20 15:32:48.147845380 +0000
>@@ -310,8 +310,6 @@ __wrap_dixLookupWindow(WindowPtr *win, X
>     return __real_dixLookupWindow(win, id, client, access);
> }
> 
>-extern ClientRec client_window;
>-
> int
> __wrap_dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client,
>                        Mask access)
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/test/xi2/protocol-common.h xserver-1.20.7+0/test/xi2/protocol-common.h
>--- xserver-1.20.7+0.old/test/xi2/protocol-common.h	2020-01-20 14:49:07.833284301 +0000
>+++ xserver-1.20.7+0/test/xi2/protocol-common.h	2020-01-20 15:55:48.526330050 +0000
>@@ -154,4 +154,6 @@ Bool __wrap_AddResource(XID id, RESTYPE
> int __wrap_dixLookupClient(ClientPtr *c, XID id, ClientPtr client, Mask access);
> int __real_dixLookupClient(ClientPtr *c, XID id, ClientPtr client, Mask access);
> 
>+extern ClientRec client_window;
>+
> #endif                          /* PROTOCOL_COMMON_H */
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/test/xi2/protocol-xigetclientpointer.c xserver-1.20.7+0/test/xi2/protocol-xigetclientpointer.c
>--- xserver-1.20.7+0.old/test/xi2/protocol-xigetclientpointer.c	2020-01-20 14:49:07.833284301 +0000
>+++ xserver-1.20.7+0/test/xi2/protocol-xigetclientpointer.c	2020-01-20 16:05:58.069969125 +0000
>@@ -46,7 +46,6 @@ static struct {
>     int win;
> } test_data;
> 
>-ClientRec client_window;
> static ClientRec client_request;
> 
> static void
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/test/xi2/protocol-xigetselectedevents.c xserver-1.20.7+0/test/xi2/protocol-xigetselectedevents.c
>--- xserver-1.20.7+0.old/test/xi2/protocol-xigetselectedevents.c	2020-01-20 14:49:07.833284301 +0000
>+++ xserver-1.20.7+0/test/xi2/protocol-xigetselectedevents.c	2020-01-20 16:06:20.994405979 +0000
>@@ -60,8 +60,6 @@ static struct {
>     int mask_len;
> } test_data;
> 
>-ClientRec client_window;
>-
> /* AddResource is called from XISetSEventMask, we don't need this */
> Bool
> __wrap_AddResource(XID id, RESTYPE type, void *value)
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/test/xi2/protocol-xipassivegrabdevice.c xserver-1.20.7+0/test/xi2/protocol-xipassivegrabdevice.c
>--- xserver-1.20.7+0.old/test/xi2/protocol-xipassivegrabdevice.c	2020-01-20 14:49:07.833284301 +0000
>+++ xserver-1.20.7+0/test/xi2/protocol-xipassivegrabdevice.c	2020-01-20 16:06:29.614570245 +0000
>@@ -41,7 +41,6 @@
> 
> #include "protocol-common.h"
> 
>-ClientRec client_window;
> static ClientRec client_request;
> 
> #define N_MODS 7
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/test/xi2/protocol-xiquerydevice.c xserver-1.20.7+0/test/xi2/protocol-xiquerydevice.c
>--- xserver-1.20.7+0.old/test/xi2/protocol-xiquerydevice.c	2020-01-20 14:49:07.833284301 +0000
>+++ xserver-1.20.7+0/test/xi2/protocol-xiquerydevice.c	2020-01-20 16:06:40.030768743 +0000
>@@ -54,8 +54,6 @@ struct test_data {
>     int num_devices_in_reply;
> };
> 
>-ClientRec client_window;
>-
> static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data,
>                                      void *closure);
> static void reply_XIQueryDevice(ClientPtr client, int len, char *data,
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/test/xi2/protocol-xiquerypointer.c xserver-1.20.7+0/test/xi2/protocol-xiquerypointer.c
>--- xserver-1.20.7+0.old/test/xi2/protocol-xiquerypointer.c	2020-01-20 14:49:07.833284301 +0000
>+++ xserver-1.20.7+0/test/xi2/protocol-xiquerypointer.c	2020-01-20 16:06:47.278906871 +0000
>@@ -41,7 +41,6 @@
> 
> #include "protocol-common.h"
> 
>-ClientRec client_window;
> static ClientRec client_request;
> static void reply_XIQueryPointer_data(ClientPtr client, int len,
>                                       char *data, void *closure);
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/test/xi2/protocol-xiqueryversion.c xserver-1.20.7+0/test/xi2/protocol-xiqueryversion.c
>--- xserver-1.20.7+0.old/test/xi2/protocol-xiqueryversion.c	2020-01-20 14:49:07.833284301 +0000
>+++ xserver-1.20.7+0/test/xi2/protocol-xiqueryversion.c	2020-01-20 16:06:57.539102399 +0000
>@@ -58,8 +58,6 @@ struct test_data {
>     int minor_expected;
> };
> 
>-ClientRec client_window;
>-
> static void
> reply_XIQueryVersion(ClientPtr client, int len, char *data, void *closure)
> {
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/test/xi2/protocol-xiselectevents.c xserver-1.20.7+0/test/xi2/protocol-xiselectevents.c
>--- xserver-1.20.7+0.old/test/xi2/protocol-xiselectevents.c	2020-01-20 14:49:07.833284301 +0000
>+++ xserver-1.20.7+0/test/xi2/protocol-xiselectevents.c	2020-01-20 16:07:07.783297632 +0000
>@@ -62,8 +62,6 @@
> 
> static unsigned char *data[4096 * 20];  /* the request data buffer */
> 
>-ClientRec client_window;
>-
> int
> __real_XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
>                       int len, unsigned char *mask);
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/test/xi2/protocol-xisetclientpointer.c xserver-1.20.7+0/test/xi2/protocol-xisetclientpointer.c
>--- xserver-1.20.7+0.old/test/xi2/protocol-xisetclientpointer.c	2020-01-20 14:49:07.833284301 +0000
>+++ xserver-1.20.7+0/test/xi2/protocol-xisetclientpointer.c	2020-01-20 16:07:17.291478832 +0000
>@@ -48,7 +48,6 @@
> 
> #include "protocol-common.h"
> 
>-ClientRec client_window;
> static ClientRec client_request;
> 
> static void
>diff -X /tmp/excludes -u -r -p xserver-1.20.7+0.old/test/xi2/protocol-xiwarppointer.c xserver-1.20.7+0/test/xi2/protocol-xiwarppointer.c
>--- xserver-1.20.7+0.old/test/xi2/protocol-xiwarppointer.c	2020-01-20 14:49:07.833284301 +0000
>+++ xserver-1.20.7+0/test/xi2/protocol-xiwarppointer.c	2020-01-20 16:07:25.371632825 +0000
>@@ -44,8 +44,6 @@
> static int expected_x = SPRITE_X;
> static int expected_y = SPRITE_Y;
> 
>-ClientRec client_window;
>-
> /**
>  * This function overrides the one in the screen rec.
>  */

Actions: View | Diff

Attachments on bug 1160423: 827854