diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-07 16:40:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-07 16:40:05 +0200 |
| commit | 8f0ed7f7a754df710b13b9dabbaa32b5d4211182 (patch) | |
| tree | 03bf52a933c29962894c2cec5f33028439cf4f5a /xorg-server/dix/privates.c | |
| parent | 7d29f4054380e7f42722c280b9caedce9fa4ace9 (diff) | |
| parent | 81fd17c8678e89cea6610b8b2996b028b21eb5dc (diff) | |
| download | vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.tar.gz vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.tar.bz2 vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver fontconfig libXdmcp mesa pixmand xkeyboard-config git update 7 oct 2013
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/privates.c
xorg-server/glx/glxcmds.c
xorg-server/hw/kdrive/ephyr/ephyr.h
xorg-server/hw/kdrive/ephyr/ephyrinit.c
xorg-server/hw/kdrive/ephyr/hostx.c
Diffstat (limited to 'xorg-server/dix/privates.c')
| -rwxr-xr-x[-rw-r--r--] | xorg-server/dix/privates.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/dix/privates.c b/xorg-server/dix/privates.c index 6f03bbcdb..f9b45d816 100644..100755 --- a/xorg-server/dix/privates.c +++ b/xorg-server/dix/privates.c @@ -80,7 +80,6 @@ static const Bool xselinux_private[PRIVATE_LAST] = { /* [PRIVATE_GC] =*/ TRUE, /* [PRIVATE_CURSOR] =*/ TRUE, /* PRIVATE_CURSOR_BITS,*/ FALSE, - /* PRIVATE_DBE_WINDOW,*/ FALSE, /* PRIVATE_DAMAGE,*/ FALSE, /* PRIVATE_GLYPH,*/ FALSE, /* [PRIVATE_GLYPHSET] =*/ TRUE, @@ -110,7 +109,6 @@ static const char *key_names[PRIVATE_LAST] = { /*[PRIVATE_CURSOR_BITS] =*/ "CURSOR_BITS", /* extension privates */ - /*[PRIVATE_DBE_WINDOW] =*/ "DBE_WINDOW", /*[PRIVATE_DAMAGE] =*/ "DAMAGE", /*[PRIVATE_GLYPH] =*/ "GLYPH", /*[PRIVATE_GLYPHSET] =*/ "GLYPHSET", @@ -132,7 +130,6 @@ static const Bool screen_specific_private[PRIVATE_LAST] = { /*[PRIVATE_GC] =*/ TRUE, /*[PRIVATE_CURSOR] =*/ FALSE, /*[PRIVATE_CURSOR_BITS] =*/ FALSE, - /*[PRIVATE_DBE_WINDOW] =*/ FALSE, /*[PRIVATE_DAMAGE] =*/ FALSE, /*[PRIVATE_GLYPH] =*/ FALSE, /*[PRIVATE_GLYPHSET] =*/ FALSE, @@ -313,7 +310,6 @@ static Bool (*const allocated_early[PRIVATE_LAST]) (FixupFunc, unsigned) = { /*PRIVATE_GC,*/ NULL, /*PRIVATE_CURSOR,*/ NULL, /*PRIVATE_CURSOR_BITS,*/ NULL, - /*PRIVATE_DBE_WINDOW,*/ NULL, /*PRIVATE_DAMAGE,*/ NULL, /*PRIVATE_GLYPH,*/ NULL, /*PRIVATE_GLYPHSET,*/ NULL, |