1 Index: composite/compalloc.c
2 ===================================================================
3 RCS file: /cvs/xserver/debrix/composite/compalloc.c,v
4 retrieving revision 1.7
5 diff -u -r1.7 compalloc.c
6 --- composite/compalloc.c 20 Nov 2003 03:31:29 -0000 1.7
7 +++ composite/compalloc.c 28 Jun 2004 01:02:43 -0000
9 CompWindowPtr cw = GetCompWindow (pWin);
10 CompClientWindowPtr ccw;
11 Bool wasMapped = pWin->mapped;
12 + ScreenPtr pScreen = pWin->drawable.pScreen;
15 * Only one Manual update is allowed
24 Index: hw/xorg/common/xf86KbdLnx.c
25 ===================================================================
26 RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86KbdLnx.c,v
27 retrieving revision 1.2
28 diff -u -r1.2 xf86KbdLnx.c
29 --- hw/xorg/common/xf86KbdLnx.c 10 Jun 2004 19:40:04 -0000 1.2
30 +++ hw/xorg/common/xf86KbdLnx.c 28 Jun 2004 01:02:43 -0000
32 #include "atKeynames.h"
34 #include "xf86Keymap.h"
35 -#include <X11/DECkeysym.h>
39 Index: hw/xorg/include/X11/extensions/Makefile.am
40 ===================================================================
41 RCS file: /cvs/xserver/debrix/hw/xorg/include/X11/extensions/Makefile.am,v
42 retrieving revision 1.1
43 diff -u -r1.1 Makefile.am
44 --- hw/xorg/include/X11/extensions/Makefile.am 11 Jun 2004 17:07:30 -0000 1.1
45 +++ hw/xorg/include/X11/extensions/Makefile.am 28 Jun 2004 01:02:43 -0000
47 -ext_INCLUDES = xf86bigfont.h xf86bigfstr.h xf86dga.h xf86dga1.h \
48 +ext_HEADERS = xf86bigfont.h xf86bigfstr.h xf86dga.h xf86dga1.h \
49 xf86dga1str.h xf86dgastr.h xf86misc.h xf86mscstr.h \
50 xf86rush.h xf86rushstr.h xf86vmode.h xf86vmstr.h
51 Index: hw/xorg/os-support/linux/lnx_KbdMap.c
52 ===================================================================
53 RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_KbdMap.c,v
54 retrieving revision 1.3
55 diff -u -r1.3 lnx_KbdMap.c
56 --- hw/xorg/os-support/linux/lnx_KbdMap.c 10 Jun 2004 19:40:55 -0000 1.3
57 +++ hw/xorg/os-support/linux/lnx_KbdMap.c 28 Jun 2004 01:02:44 -0000
59 #include "atKeynames.h"
61 #include "xf86Keymap.h"
62 -#include <X11/DECkeysym.h>
66 Index: hw/xorg/os-support/shared/drm/kernel/drm.h
67 ===================================================================
68 RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/drm/kernel/drm.h,v
69 retrieving revision 1.2
71 --- hw/xorg/os-support/shared/drm/kernel/drm.h 10 Jun 2004 19:41:11 -0000 1.2
72 +++ hw/xorg/os-support/shared/drm/kernel/drm.h 28 Jun 2004 01:02:44 -0000
76 #if defined(__linux__)
77 -#include <linux/config.h>
78 #include <asm/ioctl.h> /* For _IO* macros */
79 #define DRM_IOCTL_NR(n) _IOC_NR(n)
80 #define DRM_IOC_VOID _IOC_NONE
82 ===================================================================
83 RCS file: /cvs/xserver/debrix/os/xdmauth.c,v
84 retrieving revision 1.3
85 diff -u -r1.3 xdmauth.c
86 --- os/xdmauth.c 10 Jun 2004 19:41:59 -0000 1.3
87 +++ os/xdmauth.c 28 Jun 2004 01:02:45 -0000
93 +#include <X11/Xdmcp.h>
95 /* XDM-AUTHENTICATION-1 */