diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/fb/fballpriv.c | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/fb/fballpriv.c')
| -rw-r--r-- | xorg-server/fb/fballpriv.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/xorg-server/fb/fballpriv.c b/xorg-server/fb/fballpriv.c index 68cb2e4c0..c40796c11 100644 --- a/xorg-server/fb/fballpriv.c +++ b/xorg-server/fb/fballpriv.c @@ -27,24 +27,27 @@ #include "fb.h" #ifdef FB_SCREEN_PRIVATE -static DevPrivateKey fbScreenPrivateKey = &fbScreenPrivateKey; +static int fbScreenPrivateKeyIndex; +static DevPrivateKey fbScreenPrivateKey = &fbScreenPrivateKeyIndex; DevPrivateKey fbGetScreenPrivateKey(void) { return fbScreenPrivateKey; } #endif -static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKey; + +static int fbGCPrivateKeyIndex; +static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKeyIndex; DevPrivateKey fbGetGCPrivateKey(void) { return fbGCPrivateKey; } -#ifndef FB_NO_WINDOW_PIXMAPS -static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKey; + +static int fbWinPrivateKeyIndex; +static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKeyIndex; DevPrivateKey fbGetWinPrivateKey(void) { return fbWinPrivateKey; } -#endif Bool fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCKey) |