View | Details | Raw Unified | Return to bug 1160423
Collapse All | Expand All

(-)xserver-1.20.7+0.old/hw/dmx/config/dmxconfig.c (-1 lines)
Lines 72-78 typedef struct DMXConfigCmdStruct { Link Here
72
    DMXConfigList *xinputs;
72
    DMXConfigList *xinputs;
73
} DMXConfigCmd, *DMXConfigCmdPtr;
73
} DMXConfigCmd, *DMXConfigCmdPtr;
74
74
75
DMXConfigEntryPtr dmxConfigEntry;
76
static DMXConfigCmd dmxConfigCmd;
75
static DMXConfigCmd dmxConfigCmd;
77
76
78
static int dmxDisplaysFromCommandLine;
77
static int dmxDisplaysFromCommandLine;
(-)xserver-1.20.7+0.old/hw/dmx/config/xdmxconfig.c (-1 lines)
Lines 65-71 extern FILE *yyin; Link Here
65
#define DMX_CANVAS_WIDTH  400
65
#define DMX_CANVAS_WIDTH  400
66
#define DMX_CANVAS_HEIGHT 500
66
#define DMX_CANVAS_HEIGHT 500
67
67
68
DMXConfigEntryPtr dmxConfigEntry;
69
static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual;
68
static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual;
70
static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay;
69
static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay;
71
static int dmxConfigGrabbed, dmxConfigGrabbedFine;
70
static int dmxConfigGrabbed, dmxConfigGrabbedFine;
(-)xserver-1.20.7+0.old/hw/dmx/glxProxy/glxext.c (-2 lines)
Lines 47-54 Link Here
47
#include "extinit.h"
47
#include "extinit.h"
48
#include "glx_extinit.h"
48
#include "glx_extinit.h"
49
49
50
int noGlxExtension;
51
52
/*
50
/*
53
** Forward declarations.
51
** Forward declarations.
54
*/
52
*/
(-)xserver-1.20.7+0.old/hw/xwayland/Makefile.am (+1 lines)
Lines 3-8 bin_PROGRAMS = Xwayland Link Here
3
Xwayland_CFLAGS =				\
3
Xwayland_CFLAGS =				\
4
	-I$(top_srcdir)/glamor			\
4
	-I$(top_srcdir)/glamor			\
5
	-I$(top_srcdir)/dri3			\
5
	-I$(top_srcdir)/dri3			\
6
	-I$(top_srcdir)/hw/xfree86/common       \
6
	-DHAVE_DIX_CONFIG_H			\
7
	-DHAVE_DIX_CONFIG_H			\
7
	$(XWAYLANDMODULES_CFLAGS)		\
8
	$(XWAYLANDMODULES_CFLAGS)		\
8
	$(DIX_CFLAGS)				\
9
	$(DIX_CFLAGS)				\
(-)xserver-1.20.7+0.old/hw/xwayland/xwayland.c (-1 / +1 lines)
Lines 40-46 Link Here
40
40
41
#ifdef XF86VIDMODE
41
#ifdef XF86VIDMODE
42
#include <X11/extensions/xf86vmproto.h>
42
#include <X11/extensions/xf86vmproto.h>
43
_X_EXPORT Bool noXFree86VidModeExtension;
43
#include "xf86Extensions.h"
44
#endif
44
#endif
45
45
46
void
46
void
(-)xserver-1.20.7+0.old/test/xi1/protocol-xchangedevicecontrol.c (-1 lines)
Lines 37-43 Link Here
37
37
38
#include "protocol-common.h"
38
#include "protocol-common.h"
39
39
40
ClientRec client_window;
41
static ClientRec client_request;
40
static ClientRec client_request;
42
41
43
static void
42
static void
(-)xserver-1.20.7+0.old/test/xi2/protocol-common.c (-2 lines)
Lines 310-317 __wrap_dixLookupWindow(WindowPtr *win, X Link Here
310
    return __real_dixLookupWindow(win, id, client, access);
310
    return __real_dixLookupWindow(win, id, client, access);
311
}
311
}
312
312
313
extern ClientRec client_window;
314
315
int
313
int
316
__wrap_dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client,
314
__wrap_dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client,
317
                       Mask access)
315
                       Mask access)
(-)xserver-1.20.7+0.old/test/xi2/protocol-common.h (+2 lines)
Lines 154-157 Bool __wrap_AddResource(XID id, RESTYPE Link Here
154
int __wrap_dixLookupClient(ClientPtr *c, XID id, ClientPtr client, Mask access);
154
int __wrap_dixLookupClient(ClientPtr *c, XID id, ClientPtr client, Mask access);
155
int __real_dixLookupClient(ClientPtr *c, XID id, ClientPtr client, Mask access);
155
int __real_dixLookupClient(ClientPtr *c, XID id, ClientPtr client, Mask access);
156
156
157
extern ClientRec client_window;
158
157
#endif                          /* PROTOCOL_COMMON_H */
159
#endif                          /* PROTOCOL_COMMON_H */
(-)xserver-1.20.7+0.old/test/xi2/protocol-xigetclientpointer.c (-1 lines)
Lines 46-52 static struct { Link Here
46
    int win;
46
    int win;
47
} test_data;
47
} test_data;
48
48
49
ClientRec client_window;
50
static ClientRec client_request;
49
static ClientRec client_request;
51
50
52
static void
51
static void
(-)xserver-1.20.7+0.old/test/xi2/protocol-xigetselectedevents.c (-2 lines)
Lines 60-67 static struct { Link Here
60
    int mask_len;
60
    int mask_len;
61
} test_data;
61
} test_data;
62
62
63
ClientRec client_window;
64
65
/* AddResource is called from XISetSEventMask, we don't need this */
63
/* AddResource is called from XISetSEventMask, we don't need this */
66
Bool
64
Bool
67
__wrap_AddResource(XID id, RESTYPE type, void *value)
65
__wrap_AddResource(XID id, RESTYPE type, void *value)
(-)xserver-1.20.7+0.old/test/xi2/protocol-xipassivegrabdevice.c (-1 lines)
Lines 41-47 Link Here
41
41
42
#include "protocol-common.h"
42
#include "protocol-common.h"
43
43
44
ClientRec client_window;
45
static ClientRec client_request;
44
static ClientRec client_request;
46
45
47
#define N_MODS 7
46
#define N_MODS 7
(-)xserver-1.20.7+0.old/test/xi2/protocol-xiquerydevice.c (-2 lines)
Lines 54-61 struct test_data { Link Here
54
    int num_devices_in_reply;
54
    int num_devices_in_reply;
55
};
55
};
56
56
57
ClientRec client_window;
58
59
static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data,
57
static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data,
60
                                     void *closure);
58
                                     void *closure);
61
static void reply_XIQueryDevice(ClientPtr client, int len, char *data,
59
static void reply_XIQueryDevice(ClientPtr client, int len, char *data,
(-)xserver-1.20.7+0.old/test/xi2/protocol-xiquerypointer.c (-1 lines)
Lines 41-47 Link Here
41
41
42
#include "protocol-common.h"
42
#include "protocol-common.h"
43
43
44
ClientRec client_window;
45
static ClientRec client_request;
44
static ClientRec client_request;
46
static void reply_XIQueryPointer_data(ClientPtr client, int len,
45
static void reply_XIQueryPointer_data(ClientPtr client, int len,
47
                                      char *data, void *closure);
46
                                      char *data, void *closure);
(-)xserver-1.20.7+0.old/test/xi2/protocol-xiqueryversion.c (-2 lines)
Lines 58-65 struct test_data { Link Here
58
    int minor_expected;
58
    int minor_expected;
59
};
59
};
60
60
61
ClientRec client_window;
62
63
static void
61
static void
64
reply_XIQueryVersion(ClientPtr client, int len, char *data, void *closure)
62
reply_XIQueryVersion(ClientPtr client, int len, char *data, void *closure)
65
{
63
{
(-)xserver-1.20.7+0.old/test/xi2/protocol-xiselectevents.c (-2 lines)
Lines 62-69 Link Here
62
62
63
static unsigned char *data[4096 * 20];  /* the request data buffer */
63
static unsigned char *data[4096 * 20];  /* the request data buffer */
64
64
65
ClientRec client_window;
66
67
int
65
int
68
__real_XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
66
__real_XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
69
                      int len, unsigned char *mask);
67
                      int len, unsigned char *mask);
(-)xserver-1.20.7+0.old/test/xi2/protocol-xisetclientpointer.c (-1 lines)
Lines 48-54 Link Here
48
48
49
#include "protocol-common.h"
49
#include "protocol-common.h"
50
50
51
ClientRec client_window;
52
static ClientRec client_request;
51
static ClientRec client_request;
53
52
54
static void
53
static void
(-)xserver-1.20.7+0.old/test/xi2/protocol-xiwarppointer.c (-2 lines)
Lines 44-51 Link Here
44
static int expected_x = SPRITE_X;
44
static int expected_x = SPRITE_X;
45
static int expected_y = SPRITE_Y;
45
static int expected_y = SPRITE_Y;
46
46
47
ClientRec client_window;
48
49
/**
47
/**
50
 * This function overrides the one in the screen rec.
48
 * This function overrides the one in the screen rec.
51
 */
49
 */

Return to bug 1160423