diff options
Diffstat (limited to 'xorg-server/dix/colormap.c')
| -rw-r--r-- | xorg-server/dix/colormap.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/xorg-server/dix/colormap.c b/xorg-server/dix/colormap.c index a43e2791b..c3078503a 100644 --- a/xorg-server/dix/colormap.c +++ b/xorg-server/dix/colormap.c @@ -64,6 +64,10 @@ SOFTWARE. #include "privates.h" #include "xace.h" +#ifdef _MSC_VER +#define UpdateColors thisUpdateColors +#endif + static Pixel FindBestPixel(EntryPtr /*pentFirst */ , int /*size */ , xrgb * /*prgb */ , @@ -452,12 +456,12 @@ TellNoMap(WindowPtr pwin, Colormap * pmid) { if (wColormap(pwin) == *pmid) { /* This should be call to DeliverEvent */ - xEvent xE = { - .u.colormap.window = pwin->drawable.id, - .u.colormap.colormap = None, - .u.colormap.new = TRUE, - .u.colormap.state = ColormapUninstalled - }; + xEvent xE; + xE.u.colormap.window = pwin->drawable.id; + xE.u.colormap.colormap = None; + xE.u.colormap.new = TRUE; + xE.u.colormap.state = ColormapUninstalled; + xE.u.u.type = ColormapNotify; #ifdef PANORAMIX if (noPanoramiXExtension || !pwin->drawable.pScreen->myNum) @@ -484,12 +488,12 @@ TellLostMap(WindowPtr pwin, pointer value) #endif if (wColormap(pwin) == *pmid) { /* This should be call to DeliverEvent */ - xEvent xE = { - .u.colormap.window = pwin->drawable.id, - .u.colormap.colormap = *pmid, - .u.colormap.new = FALSE, - .u.colormap.state = ColormapUninstalled - }; + xEvent xE; + xE.u.colormap.window = pwin->drawable.id; + xE.u.colormap.colormap = *pmid; + xE.u.colormap.new = FALSE; + xE.u.colormap.state = ColormapUninstalled; + xE.u.u.type = ColormapNotify; DeliverEvents(pwin, &xE, 1, (WindowPtr) NULL); } @@ -509,12 +513,12 @@ TellGainedMap(WindowPtr pwin, pointer value) #endif if (wColormap(pwin) == *pmid) { /* This should be call to DeliverEvent */ - xEvent xE = { - .u.colormap.window = pwin->drawable.id, - .u.colormap.colormap = *pmid, - .u.colormap.new = FALSE, - .u.colormap.state = ColormapInstalled - }; + xEvent xE; + xE.u.colormap.window = pwin->drawable.id; + xE.u.colormap.colormap = *pmid; + xE.u.colormap.new = FALSE; + xE.u.colormap.state = ColormapInstalled; + xE.u.u.type = ColormapNotify; DeliverEvents(pwin, &xE, 1, (WindowPtr) NULL); } |