diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-29 16:09:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-29 16:09:45 +0200 |
| commit | 8e69b2fa996acf8fa1d218b67a203eb67e280899 (patch) | |
| tree | 1caebab7024f5b62dc57e49a69a20ef10cb8210f /xorg-server/include | |
| parent | cd103d3f4d59ac4f09cfcf126e572ddb0b9d4628 (diff) | |
| parent | f6d1847eef027266daa0f75ee92ceb09698b2761 (diff) | |
| download | vcxsrv-8e69b2fa996acf8fa1d218b67a203eb67e280899.tar.gz vcxsrv-8e69b2fa996acf8fa1d218b67a203eb67e280899.tar.bz2 vcxsrv-8e69b2fa996acf8fa1d218b67a203eb67e280899.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/glx/indirect.c
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/window.h | 1 | ||||
| -rw-r--r-- | xorg-server/include/xkbsrv.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/xorg-server/include/window.h b/xorg-server/include/window.h index 64c56aeb3..7842b4d58 100644 --- a/xorg-server/include/window.h +++ b/xorg-server/include/window.h @@ -229,4 +229,5 @@ extern _X_EXPORT void EnableMapUnmapEvents(WindowPtr /* pWin */ ); extern _X_EXPORT void SetRootClip(ScreenPtr pScreen, Bool enable); extern _X_EXPORT void PrintWindowTree(void); +extern _X_EXPORT VisualPtr WindowGetVisual(WindowPtr /*pWin*/); #endif /* WINDOW_H */ diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h index a19c8fb29..d58478543 100644 --- a/xorg-server/include/xkbsrv.h +++ b/xorg-server/include/xkbsrv.h @@ -301,6 +301,11 @@ extern _X_EXPORT const char *XkbBinDirectory; extern _X_EXPORT CARD32 xkbDebugFlags; #define _XkbLibError(c,l,d) /* Epoch fail */ + +/* "a" is a "unique" numeric identifier that just defines which error + * code statement it is. _XkbErrCode2(4, foo) means "this is the 4th error + * statement in this function". lovely. + */ #define _XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff))) #define _XkbErrCode3(a,b,c) _XkbErrCode2(a,(((unsigned int)(b))<<16)|(c)) #define _XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d))) |