diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-30 10:18:15 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-30 10:18:15 +0100 |
| commit | 33d29586bf3a280e821e0bf62694492dba459dab (patch) | |
| tree | e029e900674f4f8901cae65c95acd3e15ce3948c /xorg-server/hw/xwin/winwindow.c | |
| parent | af2d8fb974d476eadcd3cde3baebd038f5750600 (diff) | |
| parent | 7b3f315a5d8b90dcb0db5512ed91fa700027cb7a (diff) | |
| download | vcxsrv-33d29586bf3a280e821e0bf62694492dba459dab.tar.gz vcxsrv-33d29586bf3a280e821e0bf62694492dba459dab.tar.bz2 vcxsrv-33d29586bf3a280e821e0bf62694492dba459dab.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig xserver mesa git update 30 oct 2012
Conflicts:
xorg-server/dix/grabs.c
xorg-server/hw/xwin/winclipboard.h
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winmonitors.c
xorg-server/hw/xwin/winmsg.c
xorg-server/hw/xwin/winmsg.h
xorg-server/hw/xwin/winprefslex.l
xorg-server/hw/xwin/winprefsyacc.y
xorg-server/hw/xwin/winregistry.c
Diffstat (limited to 'xorg-server/hw/xwin/winwindow.c')
| -rw-r--r-- | xorg-server/hw/xwin/winwindow.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/xorg-server/hw/xwin/winwindow.c b/xorg-server/hw/xwin/winwindow.c index a847561f8..1a5bbae4e 100644 --- a/xorg-server/hw/xwin/winwindow.c +++ b/xorg-server/hw/xwin/winwindow.c @@ -59,7 +59,6 @@ winCreateWindowNativeGDI(WindowPtr pWin) Bool fResult = TRUE; ScreenPtr pScreen = pWin->drawable.pScreen; - winWindowPriv(pWin); winScreenPriv(pScreen); winDebug ("winCreateWindowNativeGDI (%p)\n", pWin); @@ -80,7 +79,6 @@ winDestroyWindowNativeGDI(WindowPtr pWin) Bool fResult = TRUE; ScreenPtr pScreen = pWin->drawable.pScreen; - winWindowPriv(pWin); winScreenPriv(pScreen); winDebug ("winDestroyWindowNativeGDI (%p)\n", pWin); @@ -101,7 +99,6 @@ winPositionWindowNativeGDI(WindowPtr pWin, int x, int y) Bool fResult = TRUE; ScreenPtr pScreen = pWin->drawable.pScreen; - winWindowPriv(pWin); winScreenPriv(pScreen); winDebug ("winPositionWindowNativeGDI (%p)\n", pWin); @@ -190,7 +187,6 @@ winChangeWindowAttributesNativeGDI(WindowPtr pWin, unsigned long mask) Bool fResult = TRUE; ScreenPtr pScreen = pWin->drawable.pScreen; - winWindowPriv(pWin); winScreenPriv(pScreen); winDebug ("winChangeWindowAttributesNativeGDI (%p)\n", pWin); @@ -216,7 +212,6 @@ winUnmapWindowNativeGDI(WindowPtr pWin) Bool fResult = TRUE; ScreenPtr pScreen = pWin->drawable.pScreen; - winWindowPriv(pWin); winScreenPriv(pScreen); winDebug ("winUnmapWindowNativeGDI (%p)\n", pWin); @@ -238,7 +233,6 @@ winMapWindowNativeGDI(WindowPtr pWin) Bool fResult = TRUE; ScreenPtr pScreen = pWin->drawable.pScreen; - winWindowPriv(pWin); winScreenPriv(pScreen); winDebug ("winMapWindowNativeGDI (%p)\n", pWin); |